SPECS: util-linux-ng.spec - builds

arekm arekm at pld-linux.org
Tue Jun 19 20:48:26 CEST 2007 

Author: arekm                        Date: Tue Jun 19 18:48:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds

---- Files affected:
SPECS:
   util-linux-ng.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/util-linux-ng.spec
diff -u SPECS/util-linux-ng.spec:1.1 SPECS/util-linux-ng.spec:1.2
--- SPECS/util-linux-ng.spec:1.1	Tue Jun 19 17:52:47 2007
+++ SPECS/util-linux-ng.spec	Tue Jun 19 20:48:21 2007
@@ -4,6 +4,7 @@
 %bcond_with	uClibc	# don't build few utilities
 %bcond_without	selinux # build without SELinux support
 #
+%define	snap	20070619
 Summary:	Collection of basic system utilities for Linux
 Summary(de.UTF-8):	Sammlung von grundlegenden Systemdienstprogrammen für Linux
 Summary(es.UTF-8):	Colectánea de utilitarios básicos de sistema para Linux
@@ -13,22 +14,20 @@
 Summary(ru.UTF-8):	Набор базовых системных утилит для Linux
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
-%define	snap	20070619
 Name:		util-linux-ng
 Version:	2.13
 Release:	0.%{snap}.1
 License:	GPL
 Group:		Applications/System
-Source0:	util-linux-ng-20070619.tar.gz
+Source0:	%{name}-20070619.tar.gz
 # Source0-md5:	0f9736ce415407c532bd37ef615f51b9
 # Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Source1:	util-linux-non-english-man-pages.tar.bz2
 # Source1-md5:	81bbcc9a820512ecde87a8f31de0b745
 Source2:	login.pamd
-Source3:	rawdevices.init
-Source4:	rawdevices.sysconfig
-Source5:	util-linux-blockdev.init
-Source6:	util-linux-blockdev.sysconfig
+Source3:	util-linux-blockdev.init
+Source4:	util-linux-blockdev.sysconfig
+Patch0:		%{name}-tinfo.patch
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -45,7 +44,9 @@
 %{!?with_uClibc:BuildRequires:	zlib-devel}
 %{!?with_uClibc:Requires:	pam >= 0.99.7.1}
 Provides:	fdisk
+Provides:	util-linux = %{version}-%{release}
 Obsoletes:	cramfs
+Obsoletes:	rawdevices
 Obsoletes:	schedutils
 Obsoletes:	util-linux-suids
 Conflicts:	shadow-extras < 1:4.0.3-6
@@ -264,6 +265,7 @@
 Summary:	chkdupexe - find duplicate executables
 Summary(pl.UTF-8):	chkdupexe odszukuje powtarzające się pliki uruchamialne
 Group:		Applications/System
+Provides:	util-linux-chkdupexe = %{version}-%{release}
 
 %description chkdupexe
 chkdupexe will scan the union of $PATH and a hardcoded list of common
@@ -328,21 +330,9 @@
 %description -n agetty -l pl.UTF-8
 agetty jest prostym linuksowym getty z obsługą portu szeregowego.
 
-%package -n rawdevices
-Summary:	Support for raw-devices
-Summary(pl.UTF-8):	Obsługa raw-device'ów
-Group:		Applications/System
-Requires(post,preun):	/sbin/chkconfig
-Requires:	rc-scripts
-
-%description -n rawdevices
-Support for raw-devices.
-
-%description -n rawdevices -l pl.UTF-8
-Obsługa raw-device'ów.
-
 %prep
 %setup -q -a1 -n %{name}
+%patch0 -p1
 sed -i -e 's#po/Makefile.in##g' configure.ac
 
 %build
@@ -364,7 +354,6 @@
 	--enable-login-chown-vcs \
 	--enable-login-utils \
 	--enable-partx \
-	%{!?with_uClibc:--enable-raw} \
 	--enable-rdev \
 	--enable-write \
 	--with-audit \
@@ -392,13 +381,10 @@
 sed -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1
 
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT%{_bindir}/raw $RPM_BUILD_ROOT/sbin
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rawdevices
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rawdevices
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.login
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
@@ -461,16 +447,6 @@
 	/sbin/chkconfig --del blockdev
 fi
 
-%post -n rawdevices
-/sbin/chkconfig --add rawdevices
-%service rawdevices restart
-
-%preun -n rawdevices
-if [ "$1" = "0" ]; then
-	%service rawdevices stop
-	/sbin/chkconfig --del rawdevices
-fi
-
 %files %{!?with_uClibc:-f %{name}.lang}
 %defattr(644,root,root,755)
 %doc */README.* text-utils/LICENSE.pg NEWS
@@ -525,7 +501,7 @@
 %attr(755,root,root) %{_bindir}/renice
 %attr(755,root,root) %{_bindir}/rev
 %attr(755,root,root) %{_bindir}/script
-%attr(755,root,root) %{_bindir}/scriptreply
+%attr(755,root,root) %{_bindir}/scriptreplay
 %attr(755,root,root) %{_bindir}/setsid
 %{!?with_uClibc:%attr(755,root,root) %{_bindir}/setterm}
 %attr(755,root,root) %{_bindir}/tailf
@@ -542,10 +518,13 @@
 %{_mandir}/man1/colrm.1*
 %{_mandir}/man1/column.1*
 %{_mandir}/man1/ddate.1*
+%{_mandir}/man1/dmesg.1*
 %{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/ionice.1*
+%{_mandir}/man1/ipcrm.1*
+%{_mandir}/man1/ipcs.1*
 %{_mandir}/man1/kill.1*
 %{_mandir}/man1/line.1*
 %{_mandir}/man1/logger.1*
@@ -555,10 +534,12 @@
 %{_mandir}/man1/namei.1*
 %{!?with_uClibc:%{_mandir}/man1/pg.1*}
 %{_mandir}/man1/readprofile.1*
+%{_mandir}/man1/renice.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/rename.1*
+%{_mandir}/man1/setsid.1*
 %{_mandir}/man1/script.1*
-%{_mandir}/man1/scriptreply.1*
+%{_mandir}/man1/scriptreplay.1*
 %{!?with_uClibc:%{_mandir}/man1/setterm.1*}
 %{_mandir}/man1/tailf.1*
 %{_mandir}/man1/taskset.1*
@@ -570,15 +551,10 @@
 %{_mandir}/man8/ctrlaltdel.8*
 %{_mandir}/man8/cytune.8*
 %{_mandir}/man8/delpart.8*
-%{_mandir}/man8/dmesg.8*
 %{_mandir}/man8/fdformat.8*
-%{_mandir}/man8/ipcrm.8*
-%{_mandir}/man8/ipcs.8*
 %{_mandir}/man8/isosize.8*
 %{_mandir}/man8/mkswap.8*
 %{_mandir}/man8/partx.8*
-%{_mandir}/man8/renice.8*
-%{_mandir}/man8/setsid.8*
 
 %lang(cs) %{_mandir}/cs/man1/write.1*
 
@@ -764,9 +740,6 @@
 %lang(pl) %{_mandir}/pl/man8/mkswap.8*
 %lang(pl) %{_mandir}/pl/man8/renice.8*
 
-%dir %{_examplesdir}/getopt
-%attr(755,root,root) %{_examplesdir}/getopt/*
-
 %attr(755,root,root) /sbin/fdisk
 %attr(755,root,root) /sbin/fsck.minix
 %attr(755,root,root) /sbin/mkfs.minix
@@ -1002,23 +975,15 @@
 %lang(es) %{_mandir}/es/man8/agetty.8*
 %lang(ja) %{_mandir}/ja/man8/agetty.8*
 
-%if !%{with uClibc}
-%files -n rawdevices
-%defattr(644,root,root,755)
-%attr(755,root,root) /sbin/raw
-%attr(754,root,root) /etc/rc.d/init.d/rawdevices
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rawdevices
-
-%{_mandir}/man8/raw.8*
-%lang(ja) %{_mandir}/ja/man8/raw.8*
-%endif
-
 %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.2  2007/06/19 18:48:21  arekm
+- builds
+
 Revision 1.1  2007/06/19 15:52:47  arekm
 - start playing with util-linux-ng
 
================================================================

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

More information about the pld-cvs-commit mailing list