packages: bluez/bluez.spec - rel 3 - merged systemd stuff into main package...

[baggins]

Author: baggins                      Date: Sun Feb  5 16:12:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- merged systemd stuff into main package
- there is no epoch

---- Files affected:
packages/bluez:
   bluez.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: packages/bluez/bluez.spec
diff -u packages/bluez/bluez.spec:1.82 packages/bluez/bluez.spec:1.83
--- packages/bluez/bluez.spec:1.82	Mon Jan 30 20:01:38 2012
+++ packages/bluez/bluez.spec	Sun Feb  5 17:12:10 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
 Version:	4.98
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/System
 #Source0Download: http://www.bluez.org/download.html
@@ -35,11 +35,12 @@
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.626
 BuildRequires:	udev-devel
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2 >= 1:2.16
 Requires:	hwdata >= 0.225
 Requires:	rc-scripts
-Provides:	bluez-utils = %{epoch}:%{version}-%{release}
+Requires:	systemd-units >= 37-0.10
+Provides:	bluez-utils = %{version}-%{release}
 Obsoletes:	bluez-hciemu
 Obsoletes:	bluez-pan
 Obsoletes:	bluez-sdp
@@ -90,7 +91,7 @@
 Summary(pl.UTF-8):	Wtyczki systemu ALSA dla urządzeń dźwiękowych Bluetooth
 Group:		Libraries
 # bluetoothd + audio service
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	alsa-lib >= 1.0.10-1
 
 %description -n alsa-plugins-bluetooth
@@ -103,7 +104,7 @@
 Summary:	Bluetooth backend for CUPS
 Summary(pl.UTF-8):	Backend Bluetooth dla CUPS-a
 Group:		Applications/Printing
-Requires:	bluez-libs >= %{epoch}:%{version}-%{release}
+Requires:	bluez-libs >= %{version}-%{release}
 Requires:	cups
 
 %description -n cups-backend-bluetooth
@@ -116,7 +117,7 @@
 Summary:	Bluetooth support for gstreamer
 Summary(pl.UTF-8):	Obsługa Bluetooth dla gstreamera
 Group:		Libraries
-Requires:	bluez-libs >= %{epoch}:%{version}-%{release}
+Requires:	bluez-libs >= %{version}-%{release}
 Requires:	gstreamer >= 0.10.30
 Requires:	gstreamer-plugins-base >= 0.10
 
@@ -146,7 +147,7 @@
 Summary:	Header files for Bluetooth applications
 Summary(pl.UTF-8):	Pliki nagłówkowe dla aplikacji Bluetooth
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	bluez-sdp-devel
 
 %description libs-devel
@@ -161,7 +162,7 @@
 Summary:	Static Bluetooth libraries
 Summary(pl.UTF-8):	Biblioteki statyczne Bluetooth
 Group:		Development/Libraries
-Requires:	%{name}-libs-devel = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs-devel = %{version}-%{release}
 Obsoletes:	bluez-sdp-static
 
 %description libs-static
@@ -172,19 +173,6 @@
 Ten pakiet zawiera biblioteki statyczne, których można używać do
 aplikacji Bluetooth.
 
-%package systemd
-Summary:	systemd units for bluez
-Summary(pl.UTF-8):	Jednostki systemd dla pakietu bluez
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	systemd-units >= 37-0.10
-
-%description systemd
-systemd units for bluez.
-
-%description systemd -l pl.UTF-8
-Jednostki systemd dla pakietu bluez.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -268,6 +256,7 @@
 %service dund restart
 %service pand restart
 %service rfcomm restart
+%systemd_post bluetooth.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -280,19 +269,17 @@
 	/sbin/chkconfig --del pand
 	/sbin/chkconfig --del rfcomm
 fi
-
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post systemd
-%systemd_post bluetooth.service
-
-%preun systemd
 %systemd_preun bluetooth.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- bluez < 4.98-3
+%systemd_trigger bluetooth.service
+
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -320,6 +307,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/rfcomm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/bluetooth.conf
+%{systemdunitdir}/bluetooth.service
+%{_datadir}/dbus-1/system-services/org.bluez.service
 %attr(755,root,root) %{udevdir}/bluetooth_serial
 %attr(755,root,root) %{udevdir}/hid2hci
 %{udevdir}/rules.d/97-bluetooth.rules
@@ -369,17 +358,17 @@
 %defattr(644,root,root,755)
 %{_libdir}/libbluetooth.a
 
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/bluetooth.service
-%{_datadir}/dbus-1/system-services/org.bluez.service
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2012/02/05 16:12:10  baggins
+- rel 3
+- merged systemd stuff into main package
+- there is no epoch
+
 Revision 1.82  2012/01/30 19:01:38  glen
 - -libs Group: Libraries
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/bluez.spec?r1=1.82&r2=1.83&f=u