SHA256
1
0
forked from pool/util-linux

checked in (request 43994)

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=48
This commit is contained in:
OBS User autobuild
2010-07-30 10:35:44 +00:00
committed by Git OBS Bridge
parent 90fbbacf81
commit 0e4629cd8c
16 changed files with 272 additions and 186 deletions

View File

@@ -1,5 +1,5 @@
#
# spec file for package util-linux (Version 2.18)
# spec file for package util-linux (Version 2.17.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,40 +17,30 @@
%define time_ver 1.7
%define which_ver 2.20
%define adjtimex_ver 1.28
Name: util-linux
BuildRequires: audit-devel
BuildRequires: gettext-devel
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRequires: zlib-devel
BuildRequires: audit-devel gettext-devel pkg-config
BuildRequires: libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel
Url: http://userweb.kernel.org/~kzak/util-linux-ng/
Supplements: filesystem(minix)
PreReq: %install_info_prereq permissions
License: GPLv2+
Group: System/Base
AutoReqProv: on
Version: 2.18
Version: 2.17.2
Release: 5
Recommends: %name-lang = %{version}
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
Source1: util-linux-rpmlintrc
# XXX: make nologin part of login package
Source2: nologin.c
Source3: nologin.8
Source4: raw.init
Source5: etc.raw
Source6: etc_filesystems
# XXX: add libmnt
Source7: baselibs.conf
%define time_ver 1.7
%define which_ver 2.19
%define adjtimex_ver 1.20
# XXX: post upstream?
Source9: adjtimex-%{adjtimex_ver}.tar.bz2
# XXX: post upstream?
@@ -76,13 +66,20 @@ Source51: blkid.conf
##
# 241372 - remove legacy warnings from fdisk
Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
# bnc#447036
Patch2: util-linux-2.14.1-mount_skip_sync.patch
# crypto patch
Patch3: util-linux-2.17.1-mount_losetup_crypto.patch
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
# 603328
Patch5: util-linux-addpart-use-atoll.patch
# bnc#481123
Patch6: util-linux-mount-detect-ro-mount.patch
Patch7: util-linux-swapon-btrfs-limitations
##
## adjtimex
##
Patch50: adjtimex-1.20-nosyscall.diff
##
## klogconsole
##
@@ -99,8 +96,8 @@ Patch70: which-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq /bin/sed
#
Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} uuid-runtime = %{version}-%{release}
Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} uuid-runtime < %{version}-%{release}
Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} schedutils = %{version}-%{release} uuid-runtime = %{version}-%{release}
Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} schedutils < %{version}-%{release} uuid-runtime < %{version}-%{release}
%description
This package contains a large variety of low-level system utilities
@@ -121,7 +118,7 @@ License: GPLv2+
Summary: Development files for the filesystem detection library
Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libblkid1 = %version
Requires: libblkid1 = %version libuuid-devel
%description -n libblkid-devel
Files needed to develop applications using the library for filesystem
@@ -159,44 +156,27 @@ Requires: libuuid1 = %version
Files to develop applications using the library to generate universally
unique IDs (UUIDs).
%package -n libmount1
License: GPLv2+
Summary: Mount library
Group: System/Filesystems
AutoReqProv: on
%description -n libmount1
Library designed to be used in low-level utils like
mount(8) and /sbin/mount.<type> helpers.
%package -n libmount-devel
License: GPLv2+
Summary: Development files for libmount1
Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libmount1 = %version
%description -n libmount-devel
Files to develop applications using the libmount library.
%lang_package
%prep
%setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version
#patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
#
cd adjtimex-*
# adjtimex patches belongs here
%patch50 -p1
cd -
# setctsid
cp %{S:22} %{S:23} .
# nologin
cp %{S:2} %{S:3} %{S:26} %{S:30} .
cd ../klogconsole
#%#patch55 -p1 -b .quiet
%patch55 -p1
%patch55 -p1 -b .quiet
%patch56 -p1
cd ../time-*
%patch60
@@ -207,11 +187,12 @@ cd ../which-*
# adjtimex build
cd adjtimex-%{adjtimex_ver}
CFLAGS="$RPM_OPT_FLAGS" ./configure
make %{?_smp_mflags}
make %{?jobs:-j%jobs}
cd ..
pushd ../
# which build
cd which-%{which_ver}
#autoreconf -fi
aclocal --force
autoconf --force
automake --force-missing --add-missing --foreign
@@ -220,7 +201,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux
make %{?_smp_mflags}
make %{?jobs:-j%jobs}
cd ..
# time build
cd time-%{time_ver}
@@ -230,16 +211,16 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux
make %{?_smp_mflags}
make %{?jobs:-j%jobs}
cd ..
# klogconsole build
cd klogconsole
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS"
cd ..
popd
# setctsid build
rm -f setctsid
make %{?_smp_mflags} setctsid CFLAGS="$RPM_OPT_FLAGS"
make %{?jobs:-j%jobs} setctsid CFLAGS="$RPM_OPT_FLAGS"
#
# util-linux itself
#
@@ -262,8 +243,11 @@ CFLAGS="$RPM_OPT_FLAGS" \
--enable-write \
--disable-use-tty-group \
--disable-static \
%ifarch %ix86 x86_64
--enable-rdev \
%endif
#
make %{?_smp_mflags}
make %{?jobs:-j%jobs}
#
gcc $RPM_OPT_FLAGS -o nologin nologin.c
gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
@@ -316,7 +300,6 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/filesystems
install -m 755 nologin $RPM_BUILD_ROOT/sbin
rm -f $RPM_BUILD_ROOT/%{_libdir}/libblkid.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libuuid.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libmount.la
%ifnarch ppc ppc64
install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin
install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8
@@ -402,12 +385,6 @@ fi
%postun -n libblkid1
/sbin/ldconfig
%post -n libmount1
/sbin/ldconfig
%postun -n libmount1
/sbin/ldconfig
%pre -n uuidd
/usr/sbin/groupadd -r uuidd 2>/dev/null || :
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
@@ -455,7 +432,6 @@ fi
/bin/more
/bin/mount
/bin/umount
/bin/findmnt
/sbin/adjtimex
/sbin/agetty
/sbin/blockdev
@@ -479,8 +455,6 @@ fi
/sbin/fsck
/sbin/switch_root
/sbin/wipefs
/sbin/fsfreeze
/sbin/swaplabel
/usr/bin/ipcmk
/bin/logger
/usr/bin/cal
@@ -499,6 +473,8 @@ fi
/usr/bin/ipcs
/usr/bin/isosize
/usr/bin/line
#/usr/bin/linux32
#/usr/bin/linux64
/usr/bin/look
/usr/bin/lscpu
/usr/bin/mcookie
@@ -597,14 +573,13 @@ fi
%{_mandir}/man8/fsck.minix.8.gz
%{_mandir}/man8/isosize.8.gz
%{_mandir}/man8/ldattach.8.gz
#%{_mandir}/man8/linux32.8.gz
#%{_mandir}/man8/linux64.8.gz
%{_mandir}/man8/losetup.8.gz
%{_mandir}/man8/mkfs.8.gz
%{_mandir}/man8/mkswap.8.gz
%{_mandir}/man8/mount.8.gz
%{_mandir}/man8/nologin.8.gz
%{_mandir}/man8/findmnt.8.gz
%{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz
%ifnarch ppc ppc64
%{_mandir}/man8/mkzimage_cmdline.8.gz
%endif
@@ -625,6 +600,7 @@ fi
%attr (755,root,root) /usr/share/getopt/getopt-parse.tcsh
%attr (755,root,root) /usr/share/getopt/getopt-test.bash
%attr (755,root,root) /usr/share/getopt/getopt-test.tcsh
#/usr/share/locale/*/LC_MESSAGES/util-linux-ng.mo
%ifnarch ia64
%doc fdisk/README.fdisk
/sbin/fdisk
@@ -637,7 +613,18 @@ fi
/sbin/cfdisk
/sbin/sfdisk
%endif
%ifarch %ix86 x86_64
/usr/sbin/ramsize
/usr/sbin/rdev
/usr/sbin/rootflags
/usr/sbin/vidmode
%{_mandir}/man8/ramsize.8.gz
%{_mandir}/man8/rdev.8.gz
%{_mandir}/man8/rootflags.8.gz
%{_mandir}/man8/vidmode.8.gz
%endif
%ifnarch s390 s390x
#%config(noreplace) /etc/fdprm
/usr/bin/cytune
/usr/sbin/fdformat
/sbin/hwclock
@@ -650,6 +637,35 @@ fi
%{_mandir}/man8/klogconsole.8.gz
%{_mandir}/man8/tunelp.8.gz
%endif
# setarch links
#%ifarch %ix86 x86_64
#/usr/bin/i386
#%{_mandir}/man8/i386.8.gz
#%endif
#%ifarch x86_64
#/usr/bin/x86_64
#%{_mandir}/man8/x86_64.8.gz
#%endif
#%ifarch s390 s390x
#/usr/bin/s390
#/usr/bin/s390x
#%{_mandir}/man8/s390.8.gz
#%{_mandir}/man8/s390x.8.gz
#%endif
#%ifarch ppc ppc64
#/usr/bin/ppc
#/usr/bin/ppc32
#/usr/bin/ppc64
#%{_mandir}/man8/ppc.8.gz
#%{_mandir}/man8/ppc32.8.gz
#%{_mandir}/man8/ppc64.8.gz
#%endif
#%ifarch ia64
#/usr/bin/i386
#/usr/bin/ia64
#%{_mandir}/man8/i386.8.gz
#%{_mandir}/man8/ia64.8.gz
#%endif
%files -n libblkid1
%defattr(-, root, root)
@@ -664,18 +680,6 @@ fi
%_libdir/pkgconfig/blkid.pc
%{_mandir}/man3/libblkid.3.gz
%files -n libmount1
%defattr(-, root, root)
/%{_lib}/libmount.so.1
/%{_lib}/libmount.so.1.*
%files -n libmount-devel
%defattr(-, root, root)
%{_libdir}/libmount.so
%dir %{_includedir}/mount
%{_includedir}/mount/mount.h
%_libdir/pkgconfig/mount.pc
%files -n uuidd
%defattr(-, root, root)
%verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd