SHA256
3
0
forked from pool/aaa_base

Accepting request 225472 from Base:System

- 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/request/show/225472
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=402
This commit is contained in:
Stephan Kulow 2014-03-11 16:25:38 +00:00 committed by Git OBS Bridge
parent d4847e4282
commit 8567f9b1b7
4 changed files with 20 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:979456bfa3b77b4776150b0763442e627f640643af5e6a9852b9dac3b11c1fe7
size 83080

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:baea9e1d142e3d9329b76277a2ff0889751d3749d946d0691efa1ddecdfc7acc
size 83744

View File

@ -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 Thu Feb 27 07:28:15 UTC 2014 - coolo@suse.com

View File

@ -17,7 +17,7 @@
Name: aaa_base Name: aaa_base
Version: 13.2+git20140217.294f5bb Version: 13.2+git20140310.a57750d
Release: 0 Release: 0
Url: https://github.com/openSUSE/aaa_base Url: https://github.com/openSUSE/aaa_base
Provides: aaa_skel = %{version}-%{release} Provides: aaa_skel = %{version}-%{release}
@ -41,7 +41,7 @@ Requires: filesystem
# for symlink check to /bin/hostname # for symlink check to /bin/hostname
BuildRequires: net-tools BuildRequires: net-tools
BuildRequires: xz 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 PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup
Summary: openSUSE Base Package Summary: openSUSE Base Package
License: GPL-2.0+ License: GPL-2.0+
@ -64,6 +64,7 @@ Summary: SUSE Linux Base Package (recommended part)
Group: System/Fhs Group: System/Fhs
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: aaa_base:/etc/DIR_COLORS Provides: aaa_base:/etc/DIR_COLORS
Recommends: cron
%description extras %description extras
The parts of aaa_base that should be installed by default but are not 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 #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 # cp $RPM_BUILD_ROOT/etc/init.d/boot.localnet $RPM_BUILD_ROOT/etc/init.d/$i
#done #done
#
install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions
%pre -f aaa_base.pre %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/group.aaa_base
%ghost /var/adm/fillup-templates/gshadow.aaa_base %ghost /var/adm/fillup-templates/gshadow.aaa_base
%ghost /var/adm/fillup-templates/shadow.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 # don't forget to also change aaa_base.post, boot.cleanup
# and /etc/permissions! # and /etc/permissions!
%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog %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/safe-rmdir.8*
/usr/share/man/man8/service.8* /usr/share/man/man8/service.8*
/usr/lib/sysctl.d/*.conf /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.backup
/var/adm/fillup-templates/sysconfig.language /var/adm/fillup-templates/sysconfig.language
/var/adm/fillup-templates/sysconfig.news /var/adm/fillup-templates/sysconfig.news