| @@ -0,0 +1,546 @@
+--- util-linux.spec.orig
++++ util-linux.spec
+@@ -17,9 +17,12 @@
+
+
+
+-Name: util-linux
++Name: mount-static
+ BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel
+-BuildRequires: libselinux-devel ncurses-devel pam-devel readline-devel zlib-devel
++BuildRequires: ncurses-devel pam-devel readline-devel zlib-devel
++%if 0%{?suse_version} > 1100
++BuildRequires: libselinux-devel
++%endif
+ Url: http://kernel.org/pub/linux/utils/util-linux
+ Provides: util rawio raw base schedutils
+ Supplements: filesystem(minix)
+@@ -30,9 +33,8 @@ Group: System/Base
+ AutoReqProv: on
+ Version: 2.14.2
+ Release: 2
+-Requires: %name-lang = %{version}
+ 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/util-linux-ng-%version.tar.bz2
+ Source1: util-linux-2.13-rpmlintrc
+ Source2: nologin.c
+ Source3: nologin.8
+@@ -58,6 +60,7 @@ Source31: addnote.c
+ Source32: v2.14-ReleaseNotes
+ Source33: v2.14.1-ReleaseNotes
+ Source34: v2.14.2-ReleaseNotes
++Source35: udev-140.tar.bz2
+ ##
+ ## util-linux patches
+ ##
+@@ -126,7 +129,7 @@ Authors:
+
+ %lang_package
+ %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 -b 35 -n util-linux-ng-%version
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+@@ -162,467 +165,62 @@ cd ../which-*
+ %patch70
+
+ %build
+-# adjtimex build
+-cd adjtimex-%{adjtimex_ver}
+-CFLAGS="$RPM_OPT_FLAGS" ./configure
+-make
+-cd ..
+-pushd ../
+-# freeramdisk build
+-cd freeramdisk
+-make CFLAGS="$RPM_OPT_FLAGS" freeramdisk
+-cd ..
+-# which build
+-cd which-%{which_ver}
+-#autoreconf -fi
+-aclocal --force
+-autoconf --force
+-automake --force-missing --add-missing --foreign
+-%{?suse_update_config:%{suse_update_config}}
+-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
+- --mandir=%{_mandir} \
+- --infodir=%{_infodir} \
+- %{_target_cpu}-suse-linux
+-make
+-cd ..
+-# time build
+-cd time-%{time_ver}
+-%{?suse_update_config:%{suse_update_config}}
+-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \
+- ./configure --prefix=/usr \
+- --mandir=%{_mandir} \
+- --infodir=%{_infodir} \
+- %{_target_cpu}-suse-linux
+-make
+-cd ..
+-# klogconsole build
+-cd klogconsole
+-make CFLAGS="$RPM_OPT_FLAGS"
+ cd ..
+-popd
+-# setctsid build
+-rm -f setctsid
+-make setctsid CFLAGS="$RPM_OPT_FLAGS"
+-#
+-# util-linux itself
+-#
+-%ifarch s390 s390x
+-CFLAGS=-DCONFIG_SMP
+-%endif
+-# architecture dependent builds
+-BUILD_ENABLE=
+-%ifarch %ix86 x86_64
+-BUILD_ENABLE="--enable-rdev"
+-%endif
++
++cd udev-140
++./configure \
++ --prefix=/usr \
++ --exec-prefix= \
++ --sysconfdir=/etc \
++ --with-libdir-name=%{_lib} \
++%if 0%{?suse_version} > 1100
++ --with-selinux \
++%endif
++ CFLAGS="$RPM_OPT_FLAGS"
++export CFLAGS
++cd extras/volume_id/lib
++make %{?jobs:-j %jobs} "CFLAGS=$CFLAGS -static -Wl,-static"
++make DESTDIR=$RPM_BUILD_ROOT install
++cd ../../../..
++
++cd util-linux-ng-2.14.2
+ # Use autogen, when building from git tree
+-autoreconf -fi
+ #./autogen.sh
++autoreconf -fi
+ ./configure --mandir=%{_mandir} \
+ --datadir=%{_datadir} \
+- --with-fsprobe=volume_id \
+ --with-audit \
+- --with-selinux \
+ --enable-elvtune \
+ --enable-mesg \
+- --enable-partx \
+ --enable-raw \
+ --enable-write \
++ --with-fsprobe=volume_id \
++%if 0%{?suse_version} > 1100
++ --with-selinux \
++%endif
+ --disable-use-tty-group \
+- $BUILD_ENABLE \
+ CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+-make
+-gcc $RPM_OPT_FLAGS -o nologin nologin.c
+-gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
+-gcc $RPM_OPT_FLAGS -o chrp-addnote %{SOURCE31}
+-
+-%check
+-cd ../time-%{time_ver}
+-make check
++
++export CFLAGS
++cd mount
++make CFLAGS="$CFLAGS -static -Wl,-static -L$RPM_BUILD_ROOT%{_libdir}"
+
+ %install
+-mkdir -p "$RPM_BUILD_ROOT"{/etc/init.d,%{_mandir}/man{1,8},\
+-/bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}}
+-cp adjtimex-*/adjtimex %{buildroot}/usr/sbin/
+-cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/
+-pushd ..
+-# freeramdisk install
+-cd freeramdisk
+-install freeramdisk $RPM_BUILD_ROOT/usr/sbin
+-install -m644 freeramdisk.info.gz $RPM_BUILD_ROOT%{_infodir}
+-cd ..
+-# which install
+-cd which-%{which_ver}
+-make install DESTDIR=$RPM_BUILD_ROOT
+-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/which
+-install -m 0644 README $RPM_BUILD_ROOT%{_defaultdocdir}/which/
+-install -m 0644 EXAMPLES $RPM_BUILD_ROOT%{_defaultdocdir}/which/
+-install -m 0644 README.alias $RPM_BUILD_ROOT%{_defaultdocdir}/which/
+-cd ..
+-# time install
+-cd time-%{time_ver}
+-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/time
+-make install DESTDIR=$RPM_BUILD_ROOT \
+- prefix=$RPM_BUILD_ROOT/usr \
+- infodir=$RPM_BUILD_ROOT%{_infodir} \
+- mandir=$RPM_BUILD_ROOT%{_mandir}
+-install -m 0644 README $RPM_BUILD_ROOT%{_defaultdocdir}/time/
+-install -m 0644 AUTHORS $RPM_BUILD_ROOT%{_defaultdocdir}/time/
+-install -m 0644 COPYING $RPM_BUILD_ROOT%{_defaultdocdir}/time/
+-install -m 0644 NEWS $RPM_BUILD_ROOT%{_defaultdocdir}/time/
+-cd ..
+-# klogconsole install
+-cd klogconsole
+-make install DEST=$RPM_BUILD_ROOT
+-popd
+ #
+ # util-linux install
+ #
++cd mount
+ make DESTDIR=$RPM_BUILD_ROOT install
+-mv $RPM_BUILD_ROOT/usr/bin/logger $RPM_BUILD_ROOT/bin/logger
+-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/filesystems
+-install -m 755 nologin $RPM_BUILD_ROOT/sbin
+-%ifnarch ppc ppc64
+-install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin
+-install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8
|
