- 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 e6c8a6b6f526c8ee260dc63d7bc82459c518cb8f..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.1
+Release:       2
 License:       distributable
 Group:         Applications/System
 # devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
@@ -51,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
@@ -70,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
@@ -340,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.
@@ -385,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
@@ -1046,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*