From 07ae24f643294a94e683fd5787b6106ac5434cc78aa618036b9f2e3c905299dc Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 10 Mar 2014 15:36:33 +0000 Subject: [PATCH] - move cron Recommends to -extras subpackage where the actual cron files are - update COPYING file to silence rpmlint warning about outdated address - adjust mktar script to new versioning scheme - implement legacy actions (bnc#861124) OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=496 --- aaa_base-13.2+git20140217.294f5bb.tar.xz | 3 --- aaa_base-13.2+git20140310.a57750d.tar.xz | 3 +++ aaa_base.changes | 10 ++++++++++ aaa_base.spec | 13 +++++++------ 4 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 aaa_base-13.2+git20140217.294f5bb.tar.xz create mode 100644 aaa_base-13.2+git20140310.a57750d.tar.xz diff --git a/aaa_base-13.2+git20140217.294f5bb.tar.xz b/aaa_base-13.2+git20140217.294f5bb.tar.xz deleted file mode 100644 index 75fea3d..0000000 --- a/aaa_base-13.2+git20140217.294f5bb.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:979456bfa3b77b4776150b0763442e627f640643af5e6a9852b9dac3b11c1fe7 -size 83080 diff --git a/aaa_base-13.2+git20140310.a57750d.tar.xz b/aaa_base-13.2+git20140310.a57750d.tar.xz new file mode 100644 index 0000000..c6371f4 --- /dev/null +++ b/aaa_base-13.2+git20140310.a57750d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baea9e1d142e3d9329b76277a2ff0889751d3749d946d0691efa1ddecdfc7acc +size 83744 diff --git a/aaa_base.changes b/aaa_base.changes index 98b40bb..301ecfa 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 10 15:32:44 UTC 2014 - lnussel@suse.de + +- move cron Recommends to -extras subpackage where the actual cron + files are +- update COPYING file to silence rpmlint warning about outdated + address +- adjust mktar script to new versioning scheme +- implement legacy actions (bnc#861124) + ------------------------------------------------------------------- Thu Feb 27 07:28:15 UTC 2014 - coolo@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index 609ad43..598e9cd 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -17,7 +17,7 @@ Name: aaa_base -Version: 13.2+git20140217.294f5bb +Version: 13.2+git20140310.a57750d Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -41,7 +41,7 @@ Requires: filesystem # for symlink check to /bin/hostname BuildRequires: net-tools BuildRequires: xz -Recommends: cron logrotate netcfg udev net-tools aaa_base-extras +Recommends: logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup Summary: openSUSE Base Package License: GPL-2.0+ @@ -64,6 +64,7 @@ Summary: SUSE Linux Base Package (recommended part) Group: System/Fhs Requires: %{name} = %{version} Provides: aaa_base:/etc/DIR_COLORS +Recommends: cron %description extras The parts of aaa_base that should be installed by default but are not @@ -118,6 +119,8 @@ done #for i in boot.local after.local before.local halt.local ; do # cp $RPM_BUILD_ROOT/etc/init.d/boot.localnet $RPM_BUILD_ROOT/etc/init.d/$i #done +# +install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions %pre -f aaa_base.pre @@ -158,10 +161,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %ghost /var/adm/fillup-templates/group.aaa_base %ghost /var/adm/fillup-templates/gshadow.aaa_base %ghost /var/adm/fillup-templates/shadow.aaa_base -#%ghost %attr(0744,root,root) /etc/init.d/after.local -#%ghost %attr(0744,root,root) /etc/init.d/before.local -#%ghost %attr(0744,root,root) /etc/init.d/boot.local -#%ghost %attr(0744,root,root) /etc/init.d/halt.local # don't forget to also change aaa_base.post, boot.cleanup # and /etc/permissions! %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog @@ -202,6 +201,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/service.8* /usr/lib/sysctl.d/*.conf +%dir /usr/lib/initscripts +%dir /usr/lib/initscripts/legacy-actions /var/adm/fillup-templates/sysconfig.backup /var/adm/fillup-templates/sysconfig.language /var/adm/fillup-templates/sysconfig.news