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

util-linux.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package util-linux (Version 2.12r+2.13rc2)
+# spec file for package util-linux (Version 2.12r+2.13rc2+git20070725)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,9 +20,9 @@ PreReq:         %install_info_prereq permissions
 License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
-Version:        2.12r+2.13rc2
+Version:        2.12r+2.13rc2+git20070725
 Release:        1
-%define upver 2.13-rc2
+%define upver 2.13rc2+git20070725
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2
 Source2:        nologin.c
@@ -56,14 +56,8 @@ Patch16:        util-linux-mount_opt_nofail.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
-# 158955 - document xfs dmapi mount options better
-Patch26:        util-linux-2.12r-mount_mount.8_xfs_update.patch 
 # 160822 - fix for 153657
 Patch29:        util-linux-2.12r-fdisk_cyl.patch
-# 179122 - Fix readprofile on ppc64
-Patch30:        util-linux-2.12r-sys_utils_readprofile_mapfile.patch
-# 205956 - default swap to V1 in any case
-Patch32:        util-linux-2.12r-disk_utils_mkswap_fix.patch
 # 238687 - let mkfs tools open block devices with O_EXCL
 Patch34:        util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch
 # 241372 - remove legacy warnings from fdisk
@@ -73,7 +67,6 @@ Patch35:        util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 Patch38:        util-linux-2.12r-mount_swapon_swsuspend_resume.patch
 # suse48633 - util-linux on x86_64 does not contain "rdev" and "vidmode"
 Patch45:        util-linux-2.13-sys_utils_build_rdev_x86_64.patch
-Patch46:        util-linux-2.13-schedutils_ionice_idle.patch
 ##
 ## adjtimex
 ##
@@ -109,15 +102,15 @@ Authors:
 %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%upver
 %patch1 -p1
 %patch16 -p1
-%patch26
+#%patch26
 %patch29 -p1
-%patch30 -p1
-%patch32 -p1
+#%patch30 -p1
+#%patch32 -p1
 %patch34 -p1
 %patch35 -p1
 #%patch38 -p1
 %patch45 -p1
-%patch46 -p1
+#%patch46 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -181,8 +174,8 @@ make setctsid CFLAGS="$RPM_OPT_FLAGS"
 CFLAGS=-DCONFIG_SMP
 %endif
 # Use autogen, when building from git tree
-autoreconf -fi
-#./autogen.sh
+#autoreconf -fi
+./autogen.sh
 ./configure --mandir=%{_mandir} \
             --datadir=%{_datadir} \
 	    --with-fsprobe=volume_id \
@@ -558,6 +551,13 @@ fi
 #%endif
 
 %changelog
+* Wed Jul 25 2007 - mkoenig@suse.de
+- update to git20070725
+- removed patches (merged upstream):
+  util-linux-2.12r-mount_mount.8_xfs_update.patch
+  util-linux-2.12r-sys_utils_readprofile_mapfile.patch
+  util-linux-2.12r-disk_utils_mkswap_fix.patch
+  util-linux-2.13-schedutils_ionice_idle.patch
 * Tue Jul 17 2007 - mkoenig@suse.de
 - updated to version 2.13-rc2:
   * add wakertc