- Update to version 84.87+git20180204.875cba8:
* Move sysconfig.backup into extra subpackage, where all the scripts using it are, too. * Create systemd timer for the cron.daily scripts for backup-rpmdb, backup-sysconfig and check-battery. Move scripts to /usr/lib/base-scripts. * Remove suse.de-cron-local. If somebody really still has a /root/cron.daily.local file, he can move it to /etc/cron.daily. * Don't modify data in root's home directory * Don't create userdel.local, this isn't in use since many years OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=620
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
%endif
|
||||
|
||||
Name: aaa_base
|
||||
Version: 84.87+git20180130.ae1f262
|
||||
Version: 84.87+git20180204.875cba8
|
||||
Release: 0
|
||||
Url: https://github.com/openSUSE/aaa_base
|
||||
Provides: aaa_skel = %{version}-%{release}
|
||||
@@ -49,7 +49,7 @@ BuildRequires: net-tools
|
||||
BuildRequires: xz
|
||||
Recommends: logrotate netcfg udev net-tools aaa_base-extras
|
||||
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date
|
||||
Requires(post): fillup /usr/bin/cmp
|
||||
Requires(post): fillup
|
||||
Summary: openSUSE Base Package
|
||||
License: GPL-2.0+
|
||||
Group: System/Fhs
|
||||
@@ -70,8 +70,8 @@ This package installs several important configuration files and central scripts.
|
||||
Summary: SUSE Linux Base Package (recommended part)
|
||||
Group: System/Fhs
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): fillup
|
||||
Provides: aaa_base:/etc/DIR_COLORS
|
||||
Recommends: cron
|
||||
|
||||
%description extras
|
||||
The parts of aaa_base that should be installed by default but are not
|
||||
@@ -156,11 +156,18 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
|
||||
%post -f aaa_base.post
|
||||
|
||||
%triggerpostun -- aaa_base
|
||||
if test -f /root/.gnupg/secring.gpg.aaa_save -a ! -f /root/.gnupg/secring.gpg ; then
|
||||
mv /root/.gnupg/secring.gpg.aaa_save /root/.gnupg/secring.gpg
|
||||
fi
|
||||
rm -f /root/.gnupg/secring.gpg.aaa_save
|
||||
%pre extras
|
||||
%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
|
||||
|
||||
%post extras
|
||||
%fillup_only -n backup
|
||||
%service_add_post backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
|
||||
|
||||
%preun extras
|
||||
%service_del_preun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
|
||||
|
||||
%postun extras
|
||||
%service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@@ -223,7 +230,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
|
||||
/usr/lib/sysctl.d/*.conf
|
||||
%dir /usr/lib/initscripts
|
||||
%dir /usr/lib/initscripts/legacy-actions
|
||||
%{_fillupdir}/sysconfig.backup
|
||||
%{_fillupdir}/sysconfig.language
|
||||
%{_fillupdir}/sysconfig.news
|
||||
%{_fillupdir}/sysconfig.proxy
|
||||
@@ -232,10 +238,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
|
||||
%files extras
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) /etc/DIR_COLORS
|
||||
/etc/cron.daily/suse.de-backup-rc.config
|
||||
/etc/cron.daily/suse.de-backup-rpmdb
|
||||
/etc/cron.daily/suse.de-check-battery
|
||||
/etc/cron.daily/suse.de-cron-local
|
||||
/etc/skel/.emacs
|
||||
/etc/skel/.inputrc
|
||||
%config /etc/profile.d/complete.bash
|
||||
@@ -245,7 +247,10 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
|
||||
/etc/profile.d/ls.tcsh
|
||||
/etc/profile.d/ls.bash
|
||||
/etc/profile.d/ls.zsh
|
||||
/usr/lib/base-scripts
|
||||
/usr/lib/systemd/system/*
|
||||
/usr/share/man/man8/resolv+.8*
|
||||
%{_fillupdir}/sysconfig.backup
|
||||
|
||||
%files malloccheck
|
||||
%defattr(-,root,root)
|
||||
|
Reference in New Issue
Block a user