Accepting request 139017 from Base:System

- Ask terminal about status line in bash.bashrc

- Update from git:
  * Remove /usr/lib/tmpfiles.d/loop.conf (bnc#784963).

- update from git:
  * remove all files not necessary for systemd
  * move files to /usr and leave symlinks around
- conflict with sysvinit

OBS-URL: https://build.opensuse.org/request/show/139017
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=362

aaa_base-12.3.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d974d2b0a6f2a4e9101495351133e74ef0ffba9af0e22b0b293106d5ab97be8e
+oid sha256:cd9a5300fb3945bbece105a4e53d2c2a4fad691485d3d9bb811d27d7f53866c6
-size 137312
+size 106816

aaa_base.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Oct 22 14:55:15 UTC 2012 - werner@suse.de
+
+- Ask terminal about status line in bash.bashrc
+
+-------------------------------------------------------------------
+Mon Oct 15 10:46:38 UTC 2012 - aj@suse.de
+
+- Update from git:
+  * Remove /usr/lib/tmpfiles.d/loop.conf (bnc#784963).
+
+-------------------------------------------------------------------
+Fri Oct 12 14:41:56 UTC 2012 - coolo@suse.com
+
+- update from git:
+  * remove all files not necessary for systemd
+  * move files to /usr and leave symlinks around
+- conflict with sysvinit
+
 -------------------------------------------------------------------
 Mon Oct  8 08:21:47 UTC 2012 - aj@suse.de
 

aaa_base.spec

@@ -27,6 +27,9 @@ Provides:       etc
 Provides:       skeleng
 Provides:       skelger
 Obsoletes:      aaa_skel < %{version}
+# do not require systemd - aaa_base is in the build environment and we don't want 
+# to pull in tons of dependencies
+Conflicts:      sysvinit-init
 Requires:       /bin/login
 Requires:       /bin/mktemp
 Requires:       /usr/bin/find
@@ -35,11 +38,10 @@ Requires:       /usr/bin/xargs
 Requires:       cpio
 Requires:       distribution-release
 Requires:       filesystem
-Requires:       psmisc
 # for symlink check to /bin/hostname
 BuildRequires:  net-tools
 Recommends:     cron 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 /sbin/insserv
+PreReq:         /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup
 Summary:        SUSE Linux Base Package
 License:        GPL-2.0+
 Group:          System/Fhs
@@ -103,14 +105,17 @@ test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
 for i in passwd group shadow gshadow ; do
   touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base
 done
+# we copy some random script there to have a valid ghost - and we can't 
+# just touch as long as there is brp-55-check-boot
+# we need to fix brp-55 first ;(
+#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
 
 %pre -f aaa_base.pre
 
 %post -f aaa_base.post
 
-%postun
-%insserv_cleanup
-
 %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
@@ -120,7 +125,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %files
 %defattr(-,root,root)
 %doc COPYING
-%config(noreplace) /etc/inittab
 %config /etc/bash.bashrc
 %config /etc/csh.cshrc
 %config /etc/csh.login
@@ -144,15 +148,14 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %config /etc/rc.status
 %config /etc/shells
 %config /etc/ttytype
-%config /etc/init.d/boot
-%config /etc/init.d/halt
-%config /etc/init.d/powerfail
-%config /etc/init.d/random
-%config /etc/init.d/single
 %ghost /var/adm/fillup-templates/passwd.aaa_base
 %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
@@ -160,29 +163,24 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /var/log/wtmp
 %ghost %attr(0600,root,root) %verify(not md5 size mtime) /var/log/btmp
 %ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /var/run/utmp
-/etc/cron.daily/suse.de-clean-tmp
+# needed also with systemd
-/etc/hushlogins
-/etc/init.d/boot.cleanup
-/etc/init.d/boot.clock
-/etc/init.d/boot.cgroup
-/etc/init.d/boot.klog
-/etc/init.d/boot.ldconfig
-/etc/init.d/boot.localfs
 /etc/init.d/boot.localnet
-/etc/init.d/boot.rootfsck
+/etc/init.d/powerfail
-/etc/init.d/boot.swap
+/etc/hushlogins
-/etc/init.d/rc
-/etc/init.d/reboot
 %dir /lib/aaa_base
 /lib/aaa_base/convert_sysctl*
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-mtab.sh
+/usr/bin/chkconfig
 /sbin/chkconfig
-/sbin/get_kernel_version
+/usr/bin/get_kernel_version
 /sbin/refresh_initrd
+/usr/sbin/refresh_initrd
 /sbin/service
+/usr/sbin/service
 /sbin/smart_agetty
+/usr/sbin/smart_agetty
 /usr/bin/ChangeSymlinks
 /usr/bin/filesize
 /usr/bin/mkinfodir
@@ -192,12 +190,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /usr/bin/safe-rmdir
 /usr/bin/setJava
 /usr/lib/restricted/bin/hostname
-%dir /usr/lib/tmpfiles.d
-/usr/lib/tmpfiles.d/loop.conf
 /usr/sbin/Check
-/usr/sbin/rcpowerfail
-/usr/sbin/rcrandom
-/usr/sbin/rcsingle
 /usr/sbin/sysconf_addword
 /usr/share/man/man1/smart_agetty.1*
 /usr/share/man/man5/defaultdomain.5*
@@ -231,11 +224,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /etc/profile.d/alias.tcsh
 /etc/profile.d/ls.tcsh
 /etc/profile.d/ls.bash
-/etc/init.d/skeleton
-/etc/init.d/skeleton.compat
-%config /sbin/quick_halt
-/sbin/quick_poweroff
-/sbin/quick_reboot
 /usr/sbin/setDefaultJava
 /usr/share/man/man7/init.d.7*
 /usr/share/man/man5/route.conf.5*