Hello community,
here is the log from the commit of package usbmuxd for openSUSE:Factory checked
in at 2013-11-29 07:05:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/usbmuxd (Old)
and /work/SRC/openSUSE:Factory/.usbmuxd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbmuxd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/usbmuxd/usbmuxd.changes 2013-04-05
09:35:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.usbmuxd.new/usbmuxd.changes 2013-11-29
07:05:35.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Nov 24 18:18:20 UTC 2013 - crrodrig...@opensuse.org
+
+- define _udevrulesdir only if not already in place
+- add systemd service %pre %post scriptlets
+- run %udev_rules_update if such macro is defined
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ usbmuxd.spec ++++++
--- /var/tmp/diff_new_pack.iPWmEv/_old 2013-11-29 07:05:35.000000000 +0100
+++ /var/tmp/diff_new_pack.iPWmEv/_new 2013-11-29 07:05:35.000000000 +0100
@@ -16,11 +16,7 @@
#
-%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
-%define _udevrulesdir /usr/lib/udev/rules.d
-%else
-%define _udevrulesdir /lib/udev/rules.d
-%endif
+%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir
udev)/rules.d}
Name: usbmuxd
%define _libname libusbmuxd
@@ -32,18 +28,16 @@
Url: http://cgit.sukimashita.com/usbmuxd.git/
Source:
http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
Patch0: 0001-Add-support-for-automatic-activation-as-systemd-serv.patch
-%if 0%{?suse_version} >= 1230
-%{?systemd_requires}
-BuildRequires: systemd
-%endif
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libplist-devel
BuildRequires: libusb-1_0-devel >= 1.0.3
BuildRequires: pkg-config
-BuildRequires: udev
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(udev)
Requires(pre): pwdutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
%description
This package provides the usbmuxd daemon for software to use through the
@@ -88,8 +82,19 @@
%pre
getent passwd usbmux >/dev/null || useradd -r -g nogroup -d /var/lib/%{name}
-s /sbin/nologin -c "%{name} daemon" usbmux
+%service_add_pre usbmuxd.service
exit 0
+%preun
+%service_del_preun usbmuxd.service
+
+%post
+%{?udev_rules_update:%udev_rules_update}
+%service_add_post usbmuxd.service
+
+%postun
+%service_del_postun usbmuxd.service
+
%prep
%setup -q
%patch0 -p1
@@ -115,9 +120,7 @@
%if %{undefined suse_version}
-DCMAKE_INSTALL_DO_STRIP=1 \
%endif
-%if 0%{?suse_version} >= 1230
-DWANT_SYSTEMD=ON \
-%endif
..
make %{?_smp_mflags}
@@ -137,9 +140,7 @@
%doc AUTHORS COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README
%{_sbindir}/usbmuxd
%{_udevrulesdir}/85-usbmuxd.rules
-%if 0%{?suse_version} >= 1230
%{_unitdir}/usbmuxd.service
-%endif
%files -n %{_libname}2
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
