SPECS: util-linux.spec - fixed broken upgrade; use %service; rel 4...

[glen]

Author: glen                         Date: Wed Feb  8 16:48:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed broken upgrade; use %service; rel 4, STBR

---- Files affected:
SPECS:
   util-linux.spec (1.274 -> 1.275) 

---- Diffs:

================================================================
Index: SPECS/util-linux.spec
diff -u SPECS/util-linux.spec:1.274 SPECS/util-linux.spec:1.275
--- SPECS/util-linux.spec:1.274	Fri Feb  3 22:09:44 2006
+++ SPECS/util-linux.spec	Wed Feb  8 17:48:03 2006
@@ -18,7 +18,7 @@
 Summary(uk):	îÁÂŚŇ ÂÁÚĎ×ÉČ ÓÉÓÔĹÍÎÉČ ŐÔÉĚŚÔ ÄĚŃ Linux
 Name:		util-linux
 Version:	2.12r
-Release:	3
+Release:	4
 License:	distributable
 Group:		Applications/System
 # devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
@@ -70,6 +70,7 @@
 BuildRequires:	libselinux-devel
 %{!?with_uClibc:BuildRequires:	ncurses-devel >= 5.0}
 %{!?with_uClibc:BuildRequires:	pam-devel >= 0.79.0}
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
 BuildRequires:	textutils
 %{!?with_uClibc:BuildRequires:	zlib-devel}
@@ -141,7 +142,7 @@
 Group:		Applications/System
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
-#Requires: uname(release) >= 2.6
+#Requires:	uname(release) >= 2.6
 
 %description -n blockdev
 The utility blockdev allows one to call block device ioctls from the
@@ -158,8 +159,8 @@
 Summary(de):	Programme zum Einrichten und Konfigurieren von Loopback-Geräten
 Summary(fr):	Programmes pour mettre en place et configurer les loopback
 Summary(pl):	Program do konfiguracji urządzenia blokowego loopback
-Summary(tr):	Yerel-çevrim aygýtlarýnýn kurulmasý ve ayarlanmasý için programlar
 Summary(ru):	đŇĎÇŇÁÍÍŮ ÄĚŃ ÎÁÓÔŇĎĘËÉ loopback-ŐÓÔŇĎĘÓÔ×
+Summary(tr):	Yerel-çevrim aygýtlarýnýn kurulmasý ve ayarlanmasý için programlar
 Summary(uk):	đŇĎÇŇÁÍÉ ÄĚŃ ËĎÎĆŚÇŐŇÁĂŚ§ loopback-ĐŇÉÓÔŇϧ×
 Group:		Applications/System
 
@@ -226,9 +227,9 @@
 Summary(de):	Programme zum montieren und abmontieren von Dateisystemen
 Summary(fr):	Programme pour monter et démonter des systčmes de fichiers
 Summary(pl):	Programy do montowania i odmontowywania systemów plików
+Summary(ru):	đŇĎÇŇÁÍÍŮ ÄĚŃ ÍĎÎÔÉŇĎ×ÁÎÉŃ É ŇÁÚÍĎÎÔÉŇĎ×ÁÎÉŃ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ
 Summary(tr):	Dosya sistemlerini bađlamak ve çözmek için programlar
 Summary(uk):	đŇĎÇŇÁÍÉ ÄĚŃ ÍĎÎÔŐ×ÁÎÎŃ ÔÁ ŇĎÚÍĎÎÔŐ×ÁÎÎŃ ĆÁĘĚĎ×ÉČ ÓÉÓÔĹÍ
-Summary(ru):	đŇĎÇŇÁÍÍŮ ÄĚŃ ÍĎÎÔÉŇĎ×ÁÎÉŃ É ŇÁÚÍĎÎÔÉŇĎ×ÁÎÉŃ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ
 Group:		Applications/System
 Requires:	cryptsetup >= 0.2-1.pre1.4
 Requires:	libgcrypt >= 1.2.0-6
@@ -505,31 +506,23 @@
 
 %post -n blockdev
 /sbin/chkconfig --add blockdev
-if [ -f /var/lock/subsys/blockdev ]; then
-	/etc/rc.d/init.d/blockdev restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/blockdev start\" to start blockdev."
-fi
+%service blockdev restart
 
 %preun -n blockdev
-if [ -f /var/lock/subsys/blockdev ]; then
-	/etc/rc.d/init.d/blockdev stop 1>&2
+if [ "$1" = "0" ]; then
+	%service blockdev stop
+	/sbin/chkconfig --del blockdev
 fi
-/sbin/chkconfig --del blockdev
 
 %post -n rawdevices
 /sbin/chkconfig --add rawdevices
-if [ -f /var/lock/subsys/rawdevices ]; then
-	/etc/rc.d/init.d/rawdevices restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/rawdevices start\" to start rawdevices."
-fi
+%service rawdevices restart
 
 %preun -n rawdevices
-if [ -f /var/lock/subsys/rawdevices ]; then
-	/etc/rc.d/init.d/rawdevices stop 1>&2
+if [ "$1" = "0" ]; then
+	%service rawdevices stop
+	/sbin/chkconfig --del rawdevices
 fi
-/sbin/chkconfig --del rawdevices
 
 %files %{!?with_uClibc:-f %{name}.lang}
 %defattr(644,root,root,755)
@@ -1094,6 +1087,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.275  2006/02/08 16:48:03  glen
+- fixed broken upgrade; use %service; rel 4, STBR
+
 Revision 1.274  2006/02/03 21:09:44  sparky
 - kill urls in cvs sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/util-linux.spec?r1=1.274&r2=1.275&f=u