From 361124d31e72696715a476e2c087c63d5b986c1e33619153bcdea654014ecc21 Mon Sep 17 00:00:00 2001
From: Hendrik Vogelsang <hvogel@suse.com>
Date: Tue, 9 Mar 2010 16:06:40 +0000
Subject: [PATCH] Accepting request 34431 from
 home:lnussel:branches:Base:System

Copy from home:lnussel:branches:Base:System/util-linux via accept of submit request 34431 revision 3.
Request was accepted with message:
reviewed okay

OBS-URL: https://build.opensuse.org/request/show/34431
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=32
---
 util-linux-ng-2.16.tar.bz2 |  3 +++
 util-linux.changes         |  6 ++++++
 util-linux.spec            | 24 ++----------------------
 3 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 util-linux-ng-2.16.tar.bz2

diff --git a/util-linux-ng-2.16.tar.bz2 b/util-linux-ng-2.16.tar.bz2
new file mode 100644
index 0000000..93b374e
--- /dev/null
+++ b/util-linux-ng-2.16.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
+size 3470040
diff --git a/util-linux.changes b/util-linux.changes
index b2dd388..a6ed5ca 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  2 09:53:04 UTC 2010 - lnussel@suse.de
+
+- drop freeramdisk (bnc#584565)
+- drop hostid (bnc#584562)
+
 -------------------------------------------------------------------
 Tue Feb 23 12:46:07 UTC 2010 - lnussel@suse.de
 
diff --git a/util-linux.spec b/util-linux.spec
index 8b7123f..2515503 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -43,8 +43,6 @@ Source7:        baselibs.conf
 %define adjtimex_ver 1.20
 # XXX: post upstream?
 Source9:        adjtimex-%{adjtimex_ver}.tar.bz2
-# XXX: DROP?
-Source10:       freeramdisk.tar.bz2
 # XXX: post upstream?
 Source11:       klogconsole.tar.bz2
 # TODO: split to separate package
@@ -66,8 +64,6 @@ Source51:       blkid.conf
 ##
 ## util-linux patches
 ##
-# add hostid. FIXME: use the one from coreutils
-Patch0:         util-linux-2.12-misc_utils_hostid.patch
 # 241372 - remove legacy warnings from fdisk
 Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 # bnc#447036
@@ -156,8 +152,8 @@ unique IDs (UUIDs).
 
 %lang_package
 %prep
-%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
-%patch0 -p1
+%setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version
+#patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -184,10 +180,6 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure
 make %{?jobs:-j%jobs}
 cd ..
 pushd ../
-# freeramdisk build
-cd freeramdisk
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" freeramdisk
-cd ..
 # which build
 cd which-%{which_ver}
 #autoreconf -fi
@@ -265,11 +257,6 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp adjtimex-*/adjtimex %{buildroot}/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
@@ -365,8 +352,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{fillup_and_insserv raw}
-txt='* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk'
-%install_info --entry="$txt" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
 %install_info --entry="* time: (time). summarizing used system resources" --info-dir=%{_infodir} %{_infodir}/time.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/which.info.gz
@@ -377,7 +362,6 @@ if [ -f etc/fstab ]; then
 fi
 
 %postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/which.info.gz
@@ -474,7 +458,6 @@ fi
 /usr/bin/flock
 /usr/bin/getopt
 /usr/bin/hexdump
-/usr/bin/hostid
 /usr/bin/ionice
 /usr/bin/ipcrm
 /usr/bin/ipcs
@@ -507,7 +490,6 @@ fi
 /usr/bin/which
 /usr/sbin/addpart
 /usr/sbin/delpart
-/usr/sbin/freeramdisk
 /usr/sbin/ldattach
 /usr/sbin/partx
 /usr/sbin/rcraw
@@ -521,7 +503,6 @@ fi
 %{_defaultdocdir}/time/*
 %{_defaultdocdir}/which/*
 %{_infodir}/ipc.info.gz
-%{_infodir}/freeramdisk.info*.gz
 %{_infodir}/time.info*.gz
 %{_infodir}/which.info*.gz
 %{_mandir}/man1/cal.1.gz
@@ -538,7 +519,6 @@ fi
 %{_mandir}/man1/hexdump.1.gz
 %{_mandir}/man1/ipcrm.1.gz
 %{_mandir}/man1/ipcs.1.gz
-%{_mandir}/man1/hostid.1.gz
 %{_mandir}/man1/line.1.gz
 %{_mandir}/man1/logger.1.gz
 %{_mandir}/man1/look.1.gz