Author: glen Date: Thu Apr 20 18:16:07 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service
---- Files affected:
SPECS:
cups.spec (1.127 -> 1.128)
---- Diffs:
================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.127 SPECS/cups.spec:1.128
--- SPECS/cups.spec:1.127 Sat Apr 15 19:37:05 2006
+++ SPECS/cups.spec Thu Apr 20 20:16:02 2006
@@ -50,12 +50,14 @@
%{?with_php:BuildRequires: php-devel}
BuildRequires: pkgconfig
BuildRequires: rpm-perlprov
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: pam >= 0.77.3
-Conflicts: ghostscript < 7.05.4
+Requires: rc-scripts
Obsoletes: LPRng
Obsoletes: lpr
+Conflicts: ghostscript < 7.05.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _ulibdir %{_prefix}/lib
@@ -87,7 +89,7 @@
Summary(pt_BR): Sistema Unix de Impressăo - bibliotecas para uso em
clientes cups
Group: Libraries
Provides: %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-libs
+Obsoletes: cups-libs
Obsoletes: libcups1
%description lib
@@ -274,7 +276,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{{rc.d/init.d,pam.d,logrotate.d},security} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security} \
$RPM_BUILD_ROOT/var/log/{,archiv/}cups
%{__make} install \
@@ -322,17 +324,11 @@
%post
/sbin/chkconfig --add cups
-if [ -f /var/lock/subsys/cups ]; then
- /etc/rc.d/init.d/cups restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/cups start\" to start cups daemon."
-fi
+%service cups restart "cups daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/cups ]; then
- /etc/rc.d/init.d/cups stop 1>&2
- fi
+ %service cups stop
/sbin/chkconfig --del cups
fi
@@ -507,6 +503,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.128 2006/04/20 18:16:02 glen
+- use %service
+
Revision 1.127 2006/04/15 17:37:05 glen
- package non-glibc dirs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.127&r2=1.128&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
