SPECS (AC-branch): hal.spec - use %service -q for external program...

glen glen at pld-linux.org
Tue Apr 17 08:29:20 CEST 2007


Author: glen                         Date: Tue Apr 17 06:29:20 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service -q for external program in -gphoto

---- Files affected:
SPECS:
   hal.spec (1.105.4.9 -> 1.105.4.10) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.105.4.9 SPECS/hal.spec:1.105.4.10
--- SPECS/hal.spec:1.105.4.9	Sun Oct  1 23:35:23 2006
+++ SPECS/hal.spec	Tue Apr 17 08:29:13 2007
@@ -7,7 +7,7 @@
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.7.1
-Release:	3
+Release:	4
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -29,8 +29,8 @@
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.60
 %if %{with docs}
-BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-utils
 BuildRequires:	doxygen
 %endif
@@ -47,11 +47,11 @@
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	which
-Requires(pre):	/usr/bin/getgid
+Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
 %pyrequires_eq	python
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus >= 0.60-4
@@ -109,10 +109,10 @@
 Summary:	HAL device manager for GNOME
 Summary(pl):	Zarządca urządzeń HALa dla GNOME
 Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
 Requires:	python-gnome-ui
 Requires:	python-gnome-vfs
 Requires:	python-pygtk-glade
-Requires:	%{name} = %{version}-%{release}
 
 %description device-manager
 GNOME program for displaying devices detected by HAL.
@@ -127,17 +127,17 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	libusb >= 0.1.10-2
 Requires:	udev >= 1:079-2
+Provides:	udev-digicam
 Obsoletes:	hotplug-digicam
 Obsoletes:	udev-digicam
-Provides:	udev-digicam
 
 %description gphoto
 Set of Udev rules and HAL device information file to handle digital
 cameras in userspace.
 
 %description gphoto -l pl
-Zestaw reguł Udev i plik z informacjami o urządzeniach HALa do
-obsługi kamer cyfrowych w przestrzeni użytkownika.
+Zestaw reguł Udev i plik z informacjami o urządzeniach HALa do obsługi
+kamer cyfrowych w przestrzeni użytkownika.
 
 %prep
 %setup -q
@@ -220,9 +220,8 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-
 %post gphoto
-%service haldaemon restart
+%service -q haldaemon restart
 %banner %{name} -e << EOF
 WARNING!
  hal-gphoto NO LONGER uses special "digicam" group.
@@ -295,6 +294,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.4.10  2007/04/17 06:29:13  glen
+- use %service -q for external program in -gphoto
+
 Revision 1.105.4.9  2006/10/01 21:35:23  glen
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.105.4.9&r2=1.105.4.10&f=u



More information about the pld-cvs-commit mailing list