From b86dc2a66b12fcf372812e0f19c4aefa495f466ab55bcc04c651340e937031b2 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Thu, 29 Jul 2010 16:04:03 +0000
Subject: [PATCH] - split off aaa_base extras subpackage with:   - ls settings
 and aliases   - bash completion   - other generic shell aliases   -
 quick_halt/poweroff/reboot script   - some default cronjobs - modified
 bash.bashrc and csh.cshrc to split out ls settings - drop alias for dir: that
 one has its own binary for a while - recommend aaa_base-extras from main
 package

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=131
---
 aaa_base.changes       | 13 +++++++++++++
 aaa_base.extrafilelist | 25 +++++++++++++++++++++++++
 aaa_base.spec          | 29 +++++++++++++++++++++++++----
 aaa_base.tar.bz2       |  4 ++--
 4 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 aaa_base.extrafilelist

diff --git a/aaa_base.changes b/aaa_base.changes
index e51fc87..340e025 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jul 29 17:52:24 CEST 2010 - ro@suse.de
+
+- split off aaa_base extras subpackage with:
+  - ls settings and aliases
+  - bash completion
+  - other generic shell aliases
+  - quick_halt/poweroff/reboot script
+  - some default cronjobs
+- modified bash.bashrc and csh.cshrc to split out ls settings
+- drop alias for dir: that one has its own binary for a while
+- recommend aaa_base-extras from main package
+
 -------------------------------------------------------------------
 Tue Jul 27 15:34:59 UTC 2010 - cristian.rodriguez@opensuse.org
 
diff --git a/aaa_base.extrafilelist b/aaa_base.extrafilelist
new file mode 100644
index 0000000..f08a93d
--- /dev/null
+++ b/aaa_base.extrafilelist
@@ -0,0 +1,25 @@
+/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
+/etc/java/README
+/etc/profile.d/complete.bash
+/etc/profile.d/alias.ash
+/etc/profile.d/alias.bash
+/etc/profile.d/alias.tcsh
+/etc/profile.d/ls.tcsh
+/etc/profile.d/ls.bash
+/etc/init.d/skeleton
+/etc/init.d/skeleton.compat
+/root/.exrc
+/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
+/usr/share/man/man8/resolv+.8
+/usr/share/man/man8/quick_halt.8
diff --git a/aaa_base.spec b/aaa_base.spec
index 9a16432..25ddb1e 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -27,27 +27,36 @@ Provides:       bin bootutls etc skeleng skelger
 Provides:       aaa_skel = %{version}-%{release}
 Obsoletes:      aaa_skel < %{version}
 Requires:       filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc
-Recommends:     cron logrotate netcfg udev 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
 AutoReqProv:    on
 Summary:        SUSE Linux Base Package
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         aaa_base.tar.bz2
 Source3:        aaa_base.specialfilelist
+Source4:        aaa_base.extrafilelist
 Source5:        arch_special.tar.bz2
 Source7:        sysconfig_parts.tar.bz2
 Source8:        get_kernel_version.c
 Source20:       aaa_base-rpmlintrc
 Source21:       aaa_base.pre
 Source22:       aaa_base.post
-# %ifarch x86_64
-# Obsoletes:      tpctl <= 4.17
-# %endif
 
 %description
 This package installs several important configuration files. Central
 scripts like SuSEconfig are also in this package.
 
+%package extras
+License:        GPLv2+
+Summary:        SUSE Linux Base Package (recommended part)
+Group:          System/Fhs
+Requires:       %{name} = %{version}
+
+%description extras
+The parts of aaa_base that should be installed by default but are not
+strictly required to run a system. (Shell aliases, bash completions
+and convenience hacks).
+
 %prep
 %setup -n aaa_base -b 5 -b 7
 cd ..
@@ -99,12 +108,21 @@ done
 test -x /usr/sbin/Check && /usr/sbin/Check
 #
 for i in `( cd $RPM_BUILD_ROOT ; find * | sort )` ; do
+    grep -qx "/$i" %{S:4} && continue
     if ! grep -E "^.* /$i\$" %{S:3} ; then
 	if ! test -d $RPM_BUILD_ROOT/$i ; then
 	    echo "/$i"
 	fi
     fi
 done > aaa_base.files
+for i in `( cd $RPM_BUILD_ROOT ; find * | sort )` ; do
+    grep -qx "/$i" %{S:4} || continue
+    if ! grep -E "^.* /$i\$" %{S:3} ; then
+	if ! test -d $RPM_BUILD_ROOT/$i ; then
+	    echo "/$i"
+	fi
+    fi
+done > aaa_base-extras.files
 
 %pre -f ../scripts/aaa_base.pre
 
@@ -122,4 +140,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %files -f aaa_base.files
 %defattr(-,root,root)
 
+%files extras -f aaa_base-extras.files
+%defattr(-,root,root)
+
 %changelog
diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2
index 0fdf82d..352eddd 100644
--- a/aaa_base.tar.bz2
+++ b/aaa_base.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:448b1681d7bf7a6c883720521b6664888db37f7b57573b301f8844b82886562c
-size 81434
+oid sha256:218d3906b9414cd80850a96979a99cc8205c9fc4e6161aa654063f957566b3c8
+size 81629