- from PLD
authorMarcin Krol <hawk@tld-linux.org>
Wed, 8 Jul 2015 10:10:23 +0000 (10:10 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Wed, 8 Jul 2015 10:10:23 +0000 (10:10 +0000)
drop-pci-db.patch [new file with mode: 0644]
udisks-ac.patch [new file with mode: 0644]
udisks.spec [new file with mode: 0644]
udisks.tmpfiles [new file with mode: 0644]

diff --git a/drop-pci-db.patch b/drop-pci-db.patch
new file mode 100644 (file)
index 0000000..6de6f56
--- /dev/null
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+    
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+    
+    Cc: Jan de Groot <jgc@archlinux.org>
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/udisks-ac.patch b/udisks-ac.patch
new file mode 100644 (file)
index 0000000..81ed5d7
--- /dev/null
@@ -0,0 +1,16 @@
+--- udisks-1.0.5/configure.ac.orig     2014-03-11 16:37:31.471100389 +0100
++++ udisks-1.0.5/configure.ac  2014-03-11 16:38:54.587763572 +0100
+@@ -3,12 +3,11 @@
+ AC_PREREQ(2.59c)
+ AC_INIT(udisks, 1.0.5, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks)
+ AM_INIT_AUTOMAKE(udisks, 1.0.5)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
diff --git a/udisks.spec b/udisks.spec
new file mode 100644 (file)
index 0000000..dd32c8f
--- /dev/null
@@ -0,0 +1,211 @@
+Summary:       Disk Management Service
+Summary(pl.UTF-8):     Usługa zarządzania dyskami
+Name:          udisks
+Version:       1.0.5
+Release:       3
+License:       GPL v2+
+Group:         Libraries
+Source0:       http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+# Source0-md5: 70d48dcfe523a74cd7c7fbbc2847fcdd
+Source1:       %{name}.tmpfiles
+Patch0:                drop-pci-db.patch
+Patch1:                %{name}-ac.patch
+URL:           http://www.freedesktop.org/wiki/Software/udisks
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake
+BuildRequires: dbus-devel >= 1.0.0
+BuildRequires: dbus-glib-devel >= 0.82
+BuildRequires: device-mapper-devel >= 2.02
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gtk-doc >= 1.3
+BuildRequires: intltool >= 0.36.0
+BuildRequires: libatasmart-devel >= 0.14
+BuildRequires: libtool
+BuildRequires: libxslt-progs
+BuildRequires: parted-devel >= 2.3
+BuildRequires: pkgconfig
+BuildRequires: polkit-devel >= 0.97
+BuildRequires: sg3_utils-devel
+BuildRequires: udev-devel >= 1:147
+BuildRequires: udev-glib-devel >= 1:147
+Requires:      dbus >= 1.0.0
+Requires:      dbus-glib >= 0.82
+Requires:      glib2 >= 1:2.16.0
+Requires:      libatasmart >= 0.14
+Requires:      polkit >= 0.97
+Requires:      udev-core >= 1:147
+Suggests:      dosfstools
+Suggests:      e2fsprogs
+Suggests:      mdadm
+Suggests:      mount
+Suggests:      mtools
+Suggests:      ntfsprogs
+Suggests:      util-linux
+Suggests:      xfsprogs
+Obsoletes:     DeviceKit-disks
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+udisks provides a daemon, D-Bus API and command line tools for
+managing disks and storage devices.
+
+%description -l pl.UTF-8
+udisks dostarcza demona, API D-Bus oraz narzędzia linii poleceń do
+zarządzania dyskami i innymi urządzeniami przechowującymi dane.
+
+%package devel
+Summary:       D-Bus interface definitions for udisks
+Summary(pl.UTF-8):     Definicje interfejsu D-Bus dla udisks
+Group:         Development/Libraries
+Obsoletes:     DeviceKit-disks-devel
+
+%description devel
+D-Bus interface definitions for udisks.
+
+%description devel -l pl.UTF-8
+Definicje interfejsu D-Bus dla udisks.
+
+%package apidocs
+Summary:       D-Bus interface documentation for udisks
+Summary(pl.UTF-8):     Dokumentacja interfejsu D-Bus dla udisks
+Group:         Documentation
+Requires:      gtk-doc-common
+Obsoletes:     DeviceKit-disks-apidocs
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
+
+%description apidocs
+D-Bus interface documentation for udisks.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja interfejsu D-Bus dla udisks.
+
+%package -n bash-completion-udisks
+Summary:       bash-completion for udisks
+Summary(pl.UTF-8):     bashowe uzupełnianie poleceń dla udisks
+Group:         Applications/Shells
+Requires:      bash-completion
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
+
+%description -n bash-completion-udisks
+This package provides bash-completion for udisks.
+
+%description -n bash-completion-udisks -l pl.UTF-8
+Pakiet ten dostarcza bashowe uzupełnianie poleceń dla udisks.
+
+%package avahi
+Summary:       udisks service configuration for avahi
+Summary(pl.UTF-8):     Konfiguracja usługi udisks dla avahi
+Group:         Applications
+Requires:      %{name} = %{version}-%{release}
+Requires:      avahi
+
+%description avahi
+udisks service configuration for avahi.
+
+%description avahi -l pl.UTF-8
+Konfiguracja usługi udisks dla avahi.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-silent-rules \
+       --enable-gtk-doc \
+       --with-html-dir=%{_gtkdocdir}
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# see https://bugs.freedesktop.org/show_bug.cgi?id=24265
+install -d $RPM_BUILD_ROOT/var/run/udisks \
+       $RPM_BUILD_ROOT/etc/bash_completion.d \
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+mv $RPM_BUILD_ROOT{%{_sysconfdir}/profile.d/udisks-bash-completion.sh,/etc/bash_completion.d/udisks}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
+%find_lang udisks
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f udisks.lang
+%defattr(644,root,root,755)
+%doc AUTHORS HACKING NEWS README
+%attr(755,root,root) %{_bindir}/udisks
+%attr(755,root,root) %{_bindir}/udisks-tcp-bridge
+%attr(755,root,root) %{_libexecdir}/udisks-daemon
+%attr(755,root,root) %{_libexecdir}/udisks-helper-ata-smart-collect
+%attr(755,root,root) %{_libexecdir}/udisks-helper-ata-smart-selftest
+%attr(755,root,root) %{_libexecdir}/udisks-helper-change-filesystem-label
+%attr(755,root,root) %{_libexecdir}/udisks-helper-change-luks-password
+%attr(755,root,root) %{_libexecdir}/udisks-helper-create-partition
+%attr(755,root,root) %{_libexecdir}/udisks-helper-create-partition-table
+%attr(755,root,root) %{_libexecdir}/udisks-helper-delete-partition
+%attr(755,root,root) %{_libexecdir}/udisks-helper-drive-benchmark
+%attr(755,root,root) %{_libexecdir}/udisks-helper-drive-detach
+%attr(755,root,root) %{_libexecdir}/udisks-helper-drive-poll
+%attr(755,root,root) %{_libexecdir}/udisks-helper-fstab-mounter
+%attr(755,root,root) %{_libexecdir}/udisks-helper-linux-md-check
+%attr(755,root,root) %{_libexecdir}/udisks-helper-linux-md-remove-component
+%attr(755,root,root) %{_libexecdir}/udisks-helper-mdadm-expand
+%attr(755,root,root) %{_libexecdir}/udisks-helper-mkfs
+%attr(755,root,root) %{_libexecdir}/udisks-helper-modify-partition
+%attr(755,root,root) /sbin/umount.udisks
+%attr(755,root,root) /lib/udev/udisks-dm-export
+%attr(755,root,root) /lib/udev/udisks-part-id
+%attr(755,root,root) /lib/udev/udisks-probe-ata-smart
+%attr(755,root,root) /lib/udev/udisks-probe-sas-expander
+/lib/udev/rules.d/80-udisks.rules
+%{systemdunitdir}/udisks.service
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.UDisks.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.UDisks.service
+%{_datadir}/polkit-1/actions/org.freedesktop.udisks.policy
+%attr(700,root,root) /var/lib/udisks
+%attr(700,root,root) /var/run/udisks
+%{systemdtmpfilesdir}/%{name}.conf
+%{_mandir}/man1/udisks-tcp-bridge.1*
+%{_mandir}/man1/udisks.1*
+%{_mandir}/man7/udisks.7*
+%{_mandir}/man8/udisks-daemon.8*
+
+%files devel
+%defattr(644,root,root,755)
+%{_datadir}/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.UDisks.xml
+%{_npkgconfigdir}/udisks.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/udisks
+
+%files -n bash-completion-udisks
+%defattr(644,root,root,755)
+/etc/bash_completion.d/udisks
+
+%files avahi
+%defattr(644,root,root,755)
+%{_sysconfdir}/avahi/services/udisks.service
diff --git a/udisks.tmpfiles b/udisks.tmpfiles
new file mode 100644 (file)
index 0000000..9a2910e
--- /dev/null
@@ -0,0 +1 @@
+d /var/run/udisks 0700 root root -