OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=20

2007-07-05 11:24:26 +00:00
parent 1ea5b121f2
commit 7e333fa6b3
17 changed files with 115 additions and 968 deletions
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package util-linux (Version 2.12r+git20070530)
+# spec file for package util-linux (Version 2.12r+2.13rc1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -17,13 +17,14 @@ Provides:       util rawio raw base schedutils
 Supplements:    filesystem(minix)
 Obsoletes:      util rawio raw base schedutils
 PreReq:         %install_info_prereq permissions
-License:        BSD License and BSD-like, GNU General Public License (GPL)
+License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
-Version:        2.12r+git20070530
-Release:        6
+Version:        2.12r+2.13rc1
+Release:        1
+%define upver 2.13-rc1
 Summary:        A collection of basic system utilities
-Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
+Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2
 Source2:        nologin.c
 Source3:        nologin.8
 Source4:        raw.init
@@ -35,8 +36,8 @@ Source6:        etc_filesystems
 Source9:        adjtimex-%{adjtimex_ver}.tar.bz2
 Source10:       freeramdisk.tar.bz2
 Source11:       klogconsole.tar.bz2
-Source12:       which-%{which_ver}.tar.gz
-Source13:       time-%{time_ver}.tar.gz
+Source12:       which-%{which_ver}.tar.bz2
+Source13:       time-%{time_ver}.tar.bz2
 Source15:       cryptoloop.txt
 Source22:       setctsid.c
 Source23:       setctsid.8
@@ -60,8 +61,6 @@ Patch8:         util-linux-2.12a-mount_procswapcheck.patch
 Patch10:        util-linux-2.12a-mount_mountpointwithcolon.patch
 # add ionice 
 Patch14:        util-linux-2.12q-sys_utils_ionice.patch
-# 104081 - make fdisk detect MAC-fs
-Patch15:        util-linux-2.11q-fdisk_fs_mac.patch
 # 104405 - mount -a doesn't work with hotpluggable devices
 Patch16:        util-linux-mount_opt_hotplug.patch
 # 115129 - mount --move doesn't work as expected
@@ -70,8 +69,6 @@ Patch21:        util-linux-2.12q-mount_umount2_not_static.patch
 # 148409 - df, mount, /proc/mounts show root mounted twice
 # TODO: Needs fix, because of 231599
 Patch22:        util-linux-2.12r-mount_mtab_update.patch
-# 153657 - fdisk is not able to manage huge disks
-Patch23:        util-linux-2.12r-fdisk_fdiskwrap.patch
 # 176582 - If the user doesn't specify -t <fstype> mount.fstype will never be called
 #TODO: check alternative upstream fix
 #Patch96:        util-linux-2.12r-mount_external_prog_on_guess.patch
@@ -89,16 +86,11 @@ Patch32:        util-linux-2.12r-disk_utils_mkswap_fix.patch
 Patch34:        util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch
 # 241372 - remove legacy warnings from fdisk
 Patch35:        util-linux-2.12r-fdisk_remove_bogus_warnings.patch
-# 242750 - mount: fix race condition when using -o loop
-Patch36:        util-linux-2.12r-mount_racy_loop.patch
 # 254437 - swapon should automatically reset the suspend signature
 # TODO: Needs to be ported to new version
 Patch38:        util-linux-2.12r-mount_swapon_swsuspend_resume.patch
 Patch40:        util-linux-2.13-sys_utils_arch.patch
-Patch42:        util-linux-2.13-build_fix_intel_check.patch
-Patch43:        util-linux-2.13-misc_utils_cal_ncurses.patch
 Patch44:        util-linux-2.13-schedutils_chrt.patch
-Patch45:        util-linux-2.13-mount_volumeid_label.patch
 ##
 ## adjtimex
 ##
@@ -131,7 +123,7 @@ Authors:
    Karel Zak <kzak@redhat.com>

 %prep
-%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
+%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%upver
 %patch1 -p1
 %patch2 -p1
 %patch5 -p0
@@ -139,12 +131,10 @@ Authors:
 %patch8 -p1
 %patch10 -p1
 %patch14 -p1
-%patch15 -p1
 %patch16 -p1
 %patch18
 %patch21
 %patch22
-%patch23 -p1
 %patch26
 %patch29 -p1
 %patch30 -p1
@@ -152,13 +142,9 @@ Authors:
 %patch32 -p1
 %patch34 -p1
 %patch35 -p1
-%patch36 -p1
 #%patch38 -p1
 %patch40 -p1
-%patch42 -p1
-%patch43 -p1
 %patch44 -p1
-%patch45 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -221,8 +207,9 @@ make setctsid CFLAGS="$RPM_OPT_FLAGS"
 %ifarch s390 s390x
 CFLAGS=-DCONFIG_SMP
 %endif
-#autoreconf -fi
-./autogen.sh
+# Use autogen, when building from git tree
+autoreconf -fi
+#./autogen.sh
 ./configure --mandir=%{_mandir} \
            --datadir=%{_datadir} \
 	    --with-fsprobe=volume_id \
@@ -304,6 +291,19 @@ rm -f $RPM_BUILD_ROOT/usr/bin/chkdupexe
 rm -f $RPM_BUILD_ROOT/usr/bin/scriptreplay
 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/chkdupexe.1
 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/scriptreplay.1
+# For now, do not package setarch and related symlinks
+rm -f $RPM_BUILD_ROOT/usr/bin/setarch
+rm -f $RPM_BUILD_ROOT/usr/bin/linux32
+rm -f $RPM_BUILD_ROOT/usr/bin/linux64
+rm -f $RPM_BUILD_ROOT/usr/bin/i386
+rm -f $RPM_BUILD_ROOT/usr/bin/x86_64
+rm -f $RPM_BUILD_ROOT/usr/bin/s390
+rm -f $RPM_BUILD_ROOT/usr/bin/s390x
+rm -f $RPM_BUILD_ROOT/usr/bin/ppc
+rm -f $RPM_BUILD_ROOT/usr/bin/ppc32
+rm -f $RPM_BUILD_ROOT/usr/bin/ppc64
+rm -f $RPM_BUILD_ROOT/usr/bin/ia64
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setarch.8
 # arch dependent
 %ifarch s390 s390x
 rm -f $RPM_BUILD_ROOT/etc/fdprm
@@ -329,6 +329,7 @@ rm -f $RPM_BUILD_ROOT/sbin/sfdisk
 rm -f $RPM_BUILD_ROOT/sbin/fdisk
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/fdisk.8*
 %endif
+%find_lang %{name}-ng %{name}.lang

 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -356,10 +357,9 @@ fi
 %verifyscript
 %verify_permissions -e /usr/bin/wall -e /usr/bin/write

-%files
+%files -f %{name}.lang
 # Common files for all archs
 %defattr(-,root,root)
-%doc INSTALL
 %doc login-utils/README.getty
 %doc login-utils/README.modems-with-agetty
 %doc login-utils/README.poeigl
@@ -372,13 +372,13 @@ fi
 %doc README.largedisk
 %config %attr(744,root,root) /etc/init.d/raw
 %config(noreplace) %attr(644,root,root) /etc/raw
+%config /etc/filesystems
 /usr/sbin/rcraw
 /bin/arch
 /bin/dmesg
 /bin/more
 /bin/mount
 /bin/umount
-%config /etc/filesystems
 /sbin/agetty
 /sbin/blockdev
 /sbin/elvtune
@@ -413,6 +413,8 @@ fi
 /usr/bin/ipcs
 /usr/bin/isosize
 /usr/bin/line
+#/usr/bin/linux32
+#/usr/bin/linux64
 /usr/bin/look
 /usr/bin/mcookie
 /usr/bin/mesg
@@ -424,6 +426,7 @@ fi
 /usr/bin/renice
 /usr/bin/rev
 /usr/bin/script
+#/usr/bin/setarch
 /usr/bin/setsid
 /usr/bin/ul
 /usr/bin/tailf
@@ -507,6 +510,7 @@ fi
 %{_mandir}/man8/partx.8.gz
 %{_mandir}/man8/pivot_root.8.gz
 %{_mandir}/man8/raw.8.gz
+#%{_mandir}/man8/setarch.8.gz
 %{_mandir}/man8/swapoff.8.gz
 %{_mandir}/man8/swapon.8.gz
 %{_mandir}/man8/umount.8.gz
@@ -531,7 +535,7 @@ fi
 /sbin/cfdisk
 /sbin/sfdisk
 %endif
-%ifarch %ix86 x86_64
+%ifarch %ix86
 /usr/sbin/ramsize
 /usr/sbin/rdev
 /usr/sbin/rootflags
@@ -555,8 +559,42 @@ fi
 %{_mandir}/man8/klogconsole.8.gz
 %{_mandir}/man8/tunelp.8.gz
 %endif
+# setarch links
+#%ifarch %ix86 x86_64
+#/usr/bin/i386
+#%endif
+#%ifarch x86_64
+#/usr/bin/x86_64
+#%endif 
+#%ifarch s390 s390x
+#/usr/bin/s390
+#/usr/bin/s390x
+#%endif
+#%ifarch ppc ppc64
+#/usr/bin/ppc
+#/usr/bin/ppc32
+#/usr/bin/ppc64
+#%endif
+#%ifarch ia64
+#/usr/bin/i386
+#/usr/bin/ia64
+#%endif

 %changelog
+* Thu Jul 05 2007 - mkoenig@suse.de
+- update to 2.13-rc1:
+  * mount fixes
+  * agetty: add 'O' escape code to display domain name
+  * blockdev: add BLKFRAGET/BLKFRASET ioctls
+  * fdisk: many significant improvements and fixes to Sun label handling
+  * update po files
+- removed patches (merged upstream):
+  util-linux-2.11q-fdisk_fs_mac.patch
+  util-linux-2.12r-fdisk_fdiskwrap.patch
+  util-linux-2.12r-mount_racy_loop.patch
+  util-linux-2.13-misc_utils_cal_ncurses.patch
+  util-linux-2.13-mount_volumeid_label.patch
+- use %%find_lang
 * Thu Jun 21 2007 - mkoenig@suse.de
 - use encoded label names with volume_id [#232929]
  util-linux-2.13-mount_volumeid_label.patch