From 7650fbe6dd233c0c46d8e5a3f90aaf8d9f4b7ba7dacb8d3ae5718bb3aa54d780 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 26 Mar 2013 14:44:19 +0000 Subject: [PATCH] Split util-linux for SRPM clarity (resend of sr#149338) OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=157 --- adjtimex_1.29.orig.tar.gz | 3 -- time-1.7.dif | 20 --------- time-1.7.tar.bz2 | 3 -- util-linux.changes | 5 +++ util-linux.spec | 87 ++++----------------------------------- which-2.20.tar.bz2 | 3 -- 6 files changed, 13 insertions(+), 108 deletions(-) delete mode 100644 adjtimex_1.29.orig.tar.gz delete mode 100644 time-1.7.dif delete mode 100644 time-1.7.tar.bz2 delete mode 100644 which-2.20.tar.bz2 diff --git a/adjtimex_1.29.orig.tar.gz b/adjtimex_1.29.orig.tar.gz deleted file mode 100644 index cf887f4..0000000 --- a/adjtimex_1.29.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a -size 85551 diff --git a/time-1.7.dif b/time-1.7.dif deleted file mode 100644 index f3b9104..0000000 --- a/time-1.7.dif +++ /dev/null @@ -1,20 +0,0 @@ ---- resuse.h -+++ resuse.h -@@ -39,6 +39,9 @@ - # if HAVE_WAIT3 - # include - # else -+# if defined(__linux__) && defined(__alpha__) -+# include -+# else - /* Process resource usage structure. */ - struct rusage - { -@@ -49,6 +52,7 @@ - ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals, - ru_nvcsw, ru_nivcsw; - }; -+# endif - # endif - #endif - diff --git a/time-1.7.tar.bz2 b/time-1.7.tar.bz2 deleted file mode 100644 index b5ed718..0000000 --- a/time-1.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83eeec8df47e4c939a09b0147c34a36462bb2762f879596e9089b2817dcff7e2 -size 92620 diff --git a/util-linux.changes b/util-linux.changes index cf4ed08..1245122 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 17 20:39:47 UTC 2013 - jengelh@inai.de + +- Split "which", "time" and "adjtimex" off util-linux + ------------------------------------------------------------------- Sat Feb 16 17:48:29 UTC 2013 - schwab@suse.de diff --git a/util-linux.spec b/util-linux.spec index 87891dd..0bbaee7 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -16,10 +16,6 @@ # -%define time_ver 1.7 -%define which_ver 2.20 -%define adjtimex_ver 1.29 - Name: util-linux BuildRequires: audit-devel BuildRequires: binutils-devel @@ -63,12 +59,7 @@ Source7: baselibs.conf Source8: login.pamd Source9: remote.pamd # TODO: split to separate package -Source10: http://ftp.debian.org/debian/pool/main/a/adjtimex/adjtimex_%{adjtimex_ver}.orig.tar.gz Source11: klogconsole.tar.bz2 -# TODO: split to separate package -Source12: which-%{which_ver}.tar.bz2 -# TODO: split to separate package -Source13: time-%{time_ver}.tar.bz2 # XXX: needed? Source22: setctsid.c Source23: setctsid.8 @@ -120,17 +111,10 @@ Patch25: 0001-Test-for-secure_getenv-too.patch # fix fdisk compilation on aarch64 Patch26: fdiskbsdlabel.patch ## -## adjtimex -## -## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -## -## time -## -Patch60: time-1.7.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -147,6 +131,13 @@ Obsoletes: raw < %{version}-%{release} Obsoletes: rawio < %{version}-%{release} Obsoletes: util < %{version}-%{release} Obsoletes: uuid-runtime < %{version}-%{release} +# +# Using "Requires" here would lend itself to help upgrading, but since +# util-linux is in the initial bootstrap, that is not a good thing to do: +# +Recommends: adjtimex +Recommends: time +Recommends: which %description This package contains a large variety of low-level system utilities @@ -216,7 +207,7 @@ Files to develop applications using the libmount library. %lang_package %prep -%setup -q -n %{name}-%{version} -a 10 -b 11 -b 12 -b 13 +%setup -q -n %{name}-%{version} -b 11 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -239,9 +230,6 @@ Files to develop applications using the libmount library. %patch25 -p1 %patch26 -p1 # -cd adjtimex-* -# adjtimex patches belongs here -cd - # setctsid cp %{S:22} %{S:23} . # nologin @@ -249,28 +237,9 @@ cp %{S:2} %{S:3} %{S:26} %{S:30} . cd ../klogconsole %patch55 -p1 %patch56 -p1 -cd ../time-* -%patch60 %build -# adjtimex build -cd adjtimex-%{adjtimex_ver} -%configure -make %{?_smp_mflags} -cd .. pushd ../ -# which build -cd which-%{which_ver} -%configure -make %{?_smp_mflags} -cd .. -# time build -cd time-%{time_ver} -export CFLAGS="%{optflags} -D_GNU_SOURCE " -export INSTALL_PROGRAM='$(INSTALL)' -%configure -make %{?_smp_mflags} -cd .. # klogconsole build cd klogconsole make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}" @@ -317,30 +286,7 @@ install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}/etc/pam.d/login install -m 644 %{SOURCE9} %{buildroot}/etc/pam.d/remote mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -cp adjtimex-*/adjtimex %{buildroot}/%{_sbindir} -cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/ pushd .. -# which install -cd which-%{which_ver} -%make_install -mkdir -p %{buildroot}%{_defaultdocdir}/which -install -m 0644 README %{buildroot}%{_defaultdocdir}/which/ -install -m 0644 EXAMPLES %{buildroot}%{_defaultdocdir}/which/ -install -m 0644 README.alias %{buildroot}%{_defaultdocdir}/which/ -cd .. -# time install -cd time-%{time_ver} -mkdir -p %{buildroot}%{_defaultdocdir}/time -make install DESTDIR=%{buildroot} \ - prefix=%{buildroot}/usr \ - infodir=%{buildroot}%{_infodir} \ - mandir=%{buildroot}%{_mandir} \ - bindir=%{buildroot}%{_bindir} -install -m 0644 README %{buildroot}%{_defaultdocdir}/time/ -install -m 0644 AUTHORS %{buildroot}%{_defaultdocdir}/time/ -install -m 0644 COPYING %{buildroot}%{_defaultdocdir}/time/ -install -m 0644 NEWS %{buildroot}%{_defaultdocdir}/time/ -cd .. # klogconsole install cd klogconsole make install DEST=%{buildroot} @@ -357,7 +303,6 @@ ln -s %{_bindir}/mount %{buildroot}/bin ln -s %{_bindir}/umount %{buildroot}/bin ln -s %{_bindir}/findmnt %{buildroot}/bin ln -s %{_bindir}/lsblk %{buildroot}/bin -ln -s %{_sbindir}/adjtimex %{buildroot}/sbin ln -s %{_sbindir}/agetty %{buildroot}/sbin ln -s %{_sbindir}/blockdev %{buildroot}/sbin ln -s %{_sbindir}/cfdisk %{buildroot}/sbin @@ -479,8 +424,6 @@ ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd %post %{fillup_and_insserv raw} -%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 %if 0%{?suse_version} <= 1130 %run_permissions %else @@ -494,8 +437,6 @@ fi %postun %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 %{insserv_cleanup} %verifyscript @@ -571,7 +512,6 @@ fi /bin/logger /bin/login /bin/lsblk -/sbin/adjtimex /sbin/agetty /sbin/blockdev /sbin/ctrlaltdel @@ -636,18 +576,15 @@ fi %{_bindir}/setsid %{_bindir}/tailf %{_bindir}/taskset -%{_bindir}/time %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare %{_bindir}/uuidgen -%{_bindir}/which %ifnarch ppc ppc64 %{_bindir}/chrp-addnote %{_bindir}/mkzimage_cmdline %endif %{_sbindir}/addpart -%{_sbindir}/adjtimex %{_sbindir}/agetty %{_sbindir}/blkid %{_sbindir}/blockdev @@ -682,12 +619,6 @@ fi %verify(not mode) %attr(0755,root,tty) %{_bindir}/wall %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write -%dir %{_defaultdocdir}/time -%dir %{_defaultdocdir}/which -%{_defaultdocdir}/time/* -%{_defaultdocdir}/which/* -%{_infodir}/time.info*.gz -%{_infodir}/which.info*.gz %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -727,7 +658,6 @@ fi %{_mandir}/man1/wall.1.gz %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz -%{_mandir}/man1/which.1.gz %{_mandir}/man1/ipcmk.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -736,7 +666,6 @@ fi %{_mandir}/man8/blockdev.8.gz %{_mandir}/man8/delpart.8.gz %{_mandir}/man8/ctrlaltdel.8.gz -%{_mandir}/man8/adjtimex.8.gz %{_mandir}/man8/blkid.8.gz %{_mandir}/man8/switch_root.8.gz %{_mandir}/man8/mkfs.bfs.8.gz diff --git a/which-2.20.tar.bz2 b/which-2.20.tar.bz2 deleted file mode 100644 index f10b8ce..0000000 --- a/which-2.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33ca01bb3d801338e4a464367d74eaab24f87041c44c9b5e1150393f1744a3a0 -size 107758