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

util-linux.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package util-linux (Version 2.12r+git20070509)
+# spec file for package util-linux (Version 2.12r+git20070530)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,7 +20,7 @@ PreReq:         %install_info_prereq permissions
 License:        BSD License and BSD-like, GNU General Public License (GPL)
 Group:          System/Base
 Autoreqprov:    on
-Version:        2.12r+git20070509
+Version:        2.12r+git20070530
 Release:        1
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@@ -47,7 +47,6 @@ Source30:       README.largedisk
 ##
 ## util-linux
 ##
-Patch0:         util-linux-2.13-mount_volume_id.patch
 # add hostid
 Patch1:         util-linux-2.12-misc_utils_hostid.patch
 # 27181 (suse12181) - wall adds newlines
@@ -67,7 +66,6 @@ Patch15:        util-linux-2.11q-fdisk_fs_mac.patch
 Patch16:        util-linux-mount_opt_hotplug.patch
 # 115129 - mount --move doesn't work as expected
 Patch18:        util-linux-2.12q-mount_--move.patch
-Patch20:        util-linux-2.12r-mount_by_uuid.patch 
 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
@@ -97,9 +95,8 @@ Patch36:        util-linux-2.12r-mount_racy_loop.patch
 # 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
-Patch41:        util-linux-2.13-build_gnu_source.patch
 Patch42:        util-linux-2.13-build_fix_intel_check.patch
-Patch43:        util-linux-2.13-build_no_perl_dependency.patch
+Patch43:        util-linux-2.13-misc_utils_cal_ncurses.patch
 ##
 ## adjtimex
 ##
@@ -133,7 +130,6 @@ Authors:
 
 %prep
 %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch5 -p0
@@ -144,7 +140,6 @@ Authors:
 %patch15 -p1
 %patch16 -p1
 %patch18
-#%patch20 -p1
 %patch21
 %patch22
 %patch23 -p1
@@ -158,7 +153,6 @@ Authors:
 %patch36 -p1
 #%patch38 -p1
 %patch40 -p1
-%patch41 -p1
 %patch42 -p1
 %patch43 -p1
 #
@@ -233,7 +227,6 @@ CFLAGS=-DCONFIG_SMP
             --enable-partx \
             --enable-raw \
             --enable-rdev \
-            --enable-perl-scripts=no \
             --enable-write \
             --disable-use-tty-group \
             CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
@@ -302,6 +295,12 @@ ln -sf ../../etc/init.d/raw $RPM_BUILD_ROOT/usr/sbin/rcraw
 # Following files we don't want to package, so remove them
 rm -f $RPM_BUILD_ROOT/usr/bin/pg
 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/pg.1*
+# Do not package these files to get rid of the perl dependency
+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
+# arch dependent
 %ifarch s390 s390x
 rm -f $RPM_BUILD_ROOT/etc/fdprm
 rm -f $RPM_BUILD_ROOT/usr/bin/cytune
@@ -554,6 +553,13 @@ fi
 %endif
 
 %changelog
+* Wed Jun 06 2007 - mkoenig@suse.de
+- update to git20070530
+- removed patches
+  util-linux-2.13-mount_volume_id.patch
+  util-linux-2.12r-mount_by_uuid.patch
+  util-linux-2.13-build_gnu_source.patch
+- fix build with ncurses
 * Tue Jun 05 2007 - mkoenig@suse.de
 - update to git20070509
   mount: NFS code removed (use mount.nfs{,4} from nfs-utils)