Accepting request 573087 from Base:System

- Update to version 84.87+git20180205.2d2832f:
  * Move /lib/aaa_base/convert_sysctl to /usr/lib/base-scripts/convert_sysctl
    to cleanup filesystem.
  * Don't create /etc/init.d/{boot.local,after.local,halt.local} in
    aaa_base.pre section.
  * Remove dead code from pre/post install sections.

- Add /var/adm/backup subdirectories to aaa_base-extras, they are
  only needed by this package.

- 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/request/show/573087
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=444

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/openSUSE/aaa_base.git</param>
-          <param name="changesrevision">ae1f2624f86386f0a1cc6b28ff0a86218ad0bc0a</param></service></servicedata>
+          <param name="changesrevision">2d2832ff10366b2f3e84fbf9d242a1787a52c118</param></service></servicedata>

aaa_base-84.87+git20180130.ae1f262.tar.xz

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

aaa_base-84.87+git20180205.2d2832f.tar.xz

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

aaa_base.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Feb 05 14:04:51 UTC 2018 - kukuk@suse.de
+
+- Update to version 84.87+git20180205.2d2832f:
+  * Move /lib/aaa_base/convert_sysctl to /usr/lib/base-scripts/convert_sysctl
+    to cleanup filesystem.
+  * Don't create /etc/init.d/{boot.local,after.local,halt.local} in
+    aaa_base.pre section.
+  * Remove dead code from pre/post install sections.
+
+-------------------------------------------------------------------
+Mon Feb  5 13:31:50 CET 2018 - kukuk@suse.de
+
+- Add /var/adm/backup subdirectories to aaa_base-extras, they are
+  only needed by this package.
+
+-------------------------------------------------------------------
+Sun Feb 04 21:39:14 UTC 2018 - kukuk@suse.de
+
+- 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
+
 -------------------------------------------------------------------
 Tue Jan 30 13:26:42 CET 2018 - kukuk@suse.de
 

aaa_base.spec

@@ -23,7 +23,7 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20180130.ae1f262
+Version:        84.87+git20180205.2d2832f
 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
@@ -102,8 +102,6 @@ systems.
 %setup -q
 
 %build
-rm -rfv files/run
-rm -fv files/var/log/btmp files/var/log/wtmp
 make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
 if test -d patches/$RPM_ARCH; then
 	pushd files
@@ -136,6 +134,9 @@ install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions
 # keep as ghost for migration
 touch %buildroot/etc/inittab
 
+# Backup directories
+install -d -m 755 %{buildroot}/var/adm/backup/{rpmdb,sysconfig}
+
 mkdir -p %{buildroot}%{_fillupdir}
 %if "%{_fillupdir}" != "/var/adm/fillup-templates"
   for f in %{buildroot}/var/adm/fillup-templates/* ; do
@@ -156,11 +157,18 @@ mkdir -p %{buildroot}%{_fillupdir}
 
 %post -f aaa_base.post
 
-%triggerpostun -- aaa_base
+%pre extras
-if test -f /root/.gnupg/secring.gpg.aaa_save -a ! -f /root/.gnupg/secring.gpg ; then
+%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
-   mv /root/.gnupg/secring.gpg.aaa_save /root/.gnupg/secring.gpg
+
-fi
+%post extras
-rm -f /root/.gnupg/secring.gpg.aaa_save
+%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)
@@ -195,8 +203,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 # and /etc/permissions!
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 /etc/hushlogins
-%dir /lib/aaa_base
-/lib/aaa_base/convert_sysctl*
 /usr/bin/chkconfig
 /sbin/chkconfig
 /usr/bin/get_kernel_version
@@ -212,6 +218,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /usr/bin/rpmlocate
 /usr/bin/safe-rm
 /usr/bin/safe-rmdir
+%dir /usr/lib/base-scripts
+/usr/lib/base-scripts/convert_sysctl
 /usr/lib/restricted/bin/hostname
 /usr/sbin/sysconf_addword
 /usr/share/man/man1/smart_agetty.1*
@@ -223,7 +231,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 +239,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 +248,14 @@ 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/backup-rpmdb
+/usr/lib/base-scripts/backup-sysconfig
+/usr/lib/base-scripts/check-battery
+/usr/lib/systemd/system/*
 /usr/share/man/man8/resolv+.8*
+/var/adm/backup/rpmdb
+/var/adm/backup/sysconfig
+%{_fillupdir}/sysconfig.backup
 
 %files malloccheck
 %defattr(-,root,root)