X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-linux.spec;h=e2b4603bd566df2d49e99dc8310d07b5d120b21e;hb=1a6cdfa0d51bc7928e8ce3b585793d620809b644;hp=e6b3a49eb762bfbad0a5552b78ddb8236957797c;hpb=80147e50ef3d8f2aef818ecb30491c88068cac4f;p=packages%2Futil-linux.git

diff --git a/util-linux.spec b/util-linux.spec
index e6b3a49..e2b4603 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_with	uClibc	# don't build few utilities
-%bcond_without	selinux		# build without SELinux support
 #
 # TODO:
 # - move raw to /sbin (potentially can be used before mount partitions)??
@@ -17,19 +16,21 @@ Summary(ru):	
 Summary(tr):	Temel sistem araçlarý
 Summary(uk):	îÁÂ¦Ò ÂÁÚÏ×ÉÈ ÓÉÓÔÅÍÎÉÈ ÕÔÉÌ¦Ô ÄÌÑ Linux
 Name:		util-linux
-Version:	2.12
-Release:	14
+Version:	2.12r
+Release:	2
 License:	distributable
 Group:		Applications/System
-# devel versions at ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/
-Source0:	http://ftp.cwi.nl/aeb/util-linux/%{name}-%{version}.tar.gz
-# Source0-md5:	997adf78b98d9d1c5db4f37ea982acff
+# devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
+Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux/%{name}-%{version}.tar.gz
+# Source0-md5:	c261230b27fc0fbcc287c76884caf2d3
 #Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	81bbcc9a820512ecde87a8f31de0b745
 Source2:	login.pamd
 Source3:	rawdevices.init
 Source4:	rawdevices.sysconfig
+Source5:	%{name}-blockdev.init
+Source6:	%{name}-blockdev.sysconfig
 Patch0:		%{name}-MCONFIG.patch
 Patch1:		%{name}-fdisk.patch
 Patch2:		%{name}-utmpx.patch
@@ -45,24 +46,32 @@ Patch11:	%{name}-posixsh.patch
 Patch12:	%{name}-ppc-hwclock.patch
 Patch13:	%{name}-no_multiline.patch
 Patch14:	%{name}-amd64.patch
-#Patch15:	%{name}-crypto-debian.patch
 Patch15:	%{name}-dm_crypt.patch
-Patch16:	%{name}-dev_t.patch
-Patch17:	%{name}-selinux.patch
-Patch18:	%{name}-blk.patch
-Patch19:	%{name}-io.patch
-Patch20:	%{name}-managed.patch
+Patch16:	%{name}-blk.patch
+Patch17:	%{name}-managed.patch
+Patch18:	%{name}-page.patch
+Patch19:	%{name}-gcc4.patch
+Patch20:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-01-nfs.dif
+Patch21:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-02-base-nfsv4.dif
+Patch22:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-03-krb5.dif
+Patch23:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-04-modify_mount_to_support_multiple_security_flavors.dif
+Patch24:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-05-mount_sloppy_fix.dif
+Patch25:	http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/%{name}-2.12-06-redhat-nfs-mount.dif
+Patch26:	%{name}-2.12q-update-mtab-when-moving.patch
+Patch27:	%{name}-2.12q-use-update_mtab-for-fake.patch
+Patch28:	%{name}-2.12q-more-fake-checks-v2.patch
+Patch29:	%{name}-2.12q-update_mtab-fixes.patch
 BuildRequires:	cryptsetup-devel
 BuildRequires:	gettext-devel
 BuildRequires:	grep
-BuildRequires:	fixed-usr-mount
-%{?with_selinux:BuildRequires:	libselinux-devel}
+BuildRequires:	libselinux-devel
 %{!?with_uClibc:BuildRequires:	ncurses-devel >= 5.0}
-%{!?with_uClibc:BuildRequires:	pam-devel >= 0.77.3}
+%{!?with_uClibc:BuildRequires:	pam-devel >= 0.79.0}
 BuildRequires:	texinfo
 BuildRequires:	textutils
 %{!?with_uClibc:BuildRequires:	zlib-devel}
-%{!?with_uClibc:Requires:	pam >= 0.77.3}
+Requires(post,preun):	/sbin/chkconfig
+%{!?with_uClibc:Requires:	pam >= 0.79.0}
 Provides:	fdisk
 Obsoletes:	cramfs
 Obsoletes:	util-linux-suids
@@ -201,6 +210,9 @@ Summary(tr):	Dosya sistemlerini ba
 Summary(uk):	ðÒÏÇÒÁÍÉ ÄÌÑ ÍÏÎÔÕ×ÁÎÎÑ ÔÁ ÒÏÚÍÏÎÔÕ×ÁÎÎÑ ÆÁÊÌÏ×ÉÈ ÓÉÓÔÅÍ
 Summary(ru):	ðÒÏÇÒÁÍÍÙ ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ É ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ
 Group:		Applications/System
+Requires:	cryptsetup >= 0.2-1.pre1.4
+Requires:	libgcrypt >= 1.2.0-6
+Requires:	libgpg-error >= 1.0-4
 
 %description -n mount
 mount is used for adding new filesystems, both local and networked, to
@@ -329,8 +341,8 @@ agetty jest prostym linuksowym getty z obs
 Summary:	Support for raw-devices
 Summary(pl):	Obs³uga raw-device'ów
 Group:		Applications/System
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 
 %description -n rawdevices
 Support for raw-devices.
@@ -357,15 +369,24 @@ Obs
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%{?with_selinux:%patch17 -p1}
+%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p0
+%patch27 -p1
+%patch28 -p0
+%patch29 -p1
 
 %build
 CC="%{__cc}"
 LDFLAGS="%{rpmldflags}"
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 export CC CFLAGS LDFLAGS
 # using %%configure2_13 isn't very wise here, it is not autoconf generated
 # configure and it doesn't take any parameters
@@ -405,6 +426,8 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,/etc/{pam.d,logrotate,rc.d/init.d,sysconfi
 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 -d $RPM_BUILD_ROOT{/etc/security,/var/lock}
 
@@ -456,10 +479,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+/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
 
 %postun
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
+%preun
+if [ -f /var/lock/subsys/blockdev ]; then
+        /etc/rc.d/init.d/blockdev stop 1>&2
+fi
+/sbin/chkconfig --del blockdev
+
 %post -n rawdevices
 /sbin/chkconfig --add rawdevices
 if [ -f /var/lock/subsys/rawdevices ]; then
@@ -494,7 +529,7 @@ fi
 %lang(ja) %{_mandir}/ja/man8/clock.8*
 %lang(ja) %{_mandir}/ja/man8/hwclock.8*
 
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/fdprm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fdprm
 
 %attr(755,root,root) /bin/arch
 %attr(755,root,root) /bin/dmesg
@@ -512,6 +547,7 @@ fi
 %attr(755,root,root) %{_bindir}/column
 %attr(755,root,root) %{_bindir}/ddate
 %attr(755,root,root) %{_bindir}/fdformat
+%attr(755,root,root) %{_bindir}/flock
 %attr(755,root,root) %{_bindir}/getopt
 %attr(755,root,root) %{_bindir}/hexdump
 %attr(755,root,root) %{_bindir}/ipcrm
@@ -536,6 +572,9 @@ fi
 %attr(755,root,root) %{_bindir}/tailf
 %attr(755,root,root) %{_sbindir}/readprofile
 
+%attr(754,root,root) /etc/rc.d/init.d/blockdev
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blockdev
+
 %{_mandir}/man1/arch.1*
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/col.1*
@@ -543,6 +582,7 @@ fi
 %{_mandir}/man1/colrm.1*
 %{_mandir}/man1/column.1*
 %{_mandir}/man1/ddate.1*
+%{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/kill.1*
@@ -990,8 +1030,8 @@ fi
 %if %{without uClibc}
 %files -n login
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/login
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.login
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/login
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.login
 %attr(755,root,root) /bin/login
 
 %{_mandir}/man1/login.1*
@@ -1007,7 +1047,7 @@ fi
 
 %files -n agetty
 %defattr(644,root,root,755)
-%attr(0755,root,root) /sbin/agetty
+%attr(755,root,root) /sbin/agetty
 
 %{_mandir}/man8/agetty.8*
 %lang(es) %{_mandir}/es/man8/agetty.8*
@@ -1018,7 +1058,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/raw
 %attr(754,root,root) /etc/rc.d/init.d/rawdevices
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/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*