SHA256
1
0
forked from pool/util-linux
OBS User unknown
2007-11-09 00:05:51 +00:00
committed by Git OBS Bridge
parent fe3a957380
commit aead370c1a
7 changed files with 122 additions and 236 deletions

View File

@@ -1,5 +1,5 @@
#
# spec file for package util-linux (Version 2.13)
# spec file for package util-linux (Version 2.13.0.1+git20071106)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,11 +20,10 @@ PreReq: %install_info_prereq permissions
License: BSD 3-Clause; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 2.13
Release: 2
%define upver 2.13
Version: 2.13.0.1+git20071106
Release: 1
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
Source2: nologin.c
Source3: nologin.8
Source4: raw.init
@@ -67,8 +66,6 @@ Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch
Patch10: util-linux-2.13-mount_losetup_crypto.patch
Patch11: util-linux-2.13-mount_fd_leak.patch
Patch12: util-linux-2.13-fdisk_cfdisk_ncursesw.patch
Patch13: util-linux-2.13-mount_helper_fix.patch
Patch14: util-linux-2.13-hwclock_rtc_option.patch
##
##
## adjtimex
@@ -102,7 +99,7 @@ Authors:
Karel Zak <kzak@redhat.com>
%prep
%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%upver
%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -111,8 +108,6 @@ Authors:
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
#
cd adjtimex-*
%patch50 -p1
@@ -176,8 +171,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 \
@@ -277,6 +272,12 @@ rm -f $RPM_BUILD_ROOT/usr/bin/parisc
rm -f $RPM_BUILD_ROOT/usr/bin/parisc32
rm -f $RPM_BUILD_ROOT/usr/bin/parisc64
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setarch.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/i386.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/x86_64.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/linux{32,64}.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ia64.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/s390{,x}.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ppc{,32,64}.8
# arch dependent
%ifarch s390 s390x
rm -f $RPM_BUILD_ROOT/etc/fdprm
@@ -553,6 +554,12 @@ fi
#/usr/bin/ia64
#%endif
%changelog
* Tue Nov 06 2007 - mkoenig@suse.de
- update to 2.13.0.1+git20071106
- prevent loop mounting the same file twice [#240653]
- merged upstream:
util-linux-2.13-mount_helper_fix.patch
util-linux-2.13-hwclock_rtc_option.patch
* Thu Oct 04 2007 - bg@suse.de
- don't use parisc, parisc32 and parisc64.
* Mon Oct 01 2007 - mkoenig@suse.de