]> git.pld-linux.org Git - packages/util-linux.git/blobdiff - util-linux.spec
projects / packages / util-linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
[packages/util-linux.git] / util-linux.spec
diff --git a/util-linux.spec b/util-linux.spec
index 4183d617e20b93a172716fcf962ef59fb56e9091..e2b4603bd566df2d49e99dc8310d07b5d120b21e 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -17,7 +17,7 @@ Summary(tr):  Temel sistem ara
 Summary(uk):   îÁ¦ҠÂÁÚÏ×ÉÈ ÓÉÓÔÅÍÎÉÈ ÕÔÉ̦ԠÄÌÑ Linux
 Name:          util-linux
 Version:       2.12r
-Release:       1
+Release:       2
 License:       distributable
 Group:         Applications/System
 # devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
@@ -29,6 +29,8 @@ Source1:      %{name}-non-english-man-pages.tar.bz2
 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
@@ -49,16 +51,16 @@ 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/util-linux-2.12-01-nfs.dif
-Patch21:       http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/util-linux-2.12-02-base-nfsv4.dif
-Patch22:       http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/util-linux-2.12-03-krb5.dif
-Patch23:       http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/util-linux-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/util-linux-2.12-05-mount_sloppy_fix.dif
-Patch25:       http://www.citi.umich.edu/projects/nfsv4/linux/util-linux-patches/2.12-3/util-linux-2.12-06-redhat-nfs-mount.dif
-Patch26:       util-linux-2.12q-update-mtab-when-moving.patch
-Patch27:       util-linux-2.12q-use-update_mtab-for-fake.patch
-Patch28:       util-linux-2.12q-more-fake-checks-v2.patch
-Patch29:       util-linux-2.12q-update_mtab-fixes.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
@@ -68,6 +70,7 @@ BuildRequires:        libselinux-devel
 BuildRequires: texinfo
 BuildRequires: textutils
 %{!?with_uClibc:BuildRequires: zlib-devel}
+Requires(post,preun):  /sbin/chkconfig
 %{!?with_uClibc:Requires:      pam >= 0.79.0}
 Provides:      fdisk
 Obsoletes:     cramfs
@@ -338,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.
@@ -383,7 +386,7 @@ Obs
 %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
@@ -423,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}
 
@@ -474,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
@@ -512,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
@@ -555,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*
@@ -1010,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*
@@ -1027,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*
@@ -1038,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*
Collection of basic system utilities for Linux
This page took 0.084759 seconds and 4 git commands to generate.