From 20b4fb41dcffa12aac4e68ca60a270f5b1117295d5eecd5dabf729c57566b8b5 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 28 May 2013 05:23:53 +0000
Subject: [PATCH] Accepting request 176739 from Base:System

- move sysctl defaults to aaa_base (bnc#820443)

OBS-URL: https://build.opensuse.org/request/show/176739
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=380
---
 aaa_base-13.1.tar.xz |  4 ++--
 aaa_base.changes     |  5 +++++
 aaa_base.spec        | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/aaa_base-13.1.tar.xz b/aaa_base-13.1.tar.xz
index 12768c2..7f12ce1 100644
--- a/aaa_base-13.1.tar.xz
+++ b/aaa_base-13.1.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:979c94570391e82b3ff31ea03fad7326b49044f191bb6472e6fd83ba8e86c012
-size 83164
+oid sha256:cb6657815b53f920e447a75faf56761bb9e491946625b20de294a3d825bbd798
+size 84076
diff --git a/aaa_base.changes b/aaa_base.changes
index 9bc0731..f21586e 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 27 11:15:26 UTC 2013 - lnussel@suse.de
+
+- move sysctl defaults to aaa_base (bnc#820443)
+
 -------------------------------------------------------------------
 Thu May 23 15:23:53 UTC 2013 - werner@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 24bd61e..92950fa 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -98,6 +98,12 @@ fi
 #
 make DESTDIR=$RPM_BUILD_ROOT install
 #
+mkdir -p %{buildroot}/etc/sysctl.d
+case "$RPM_ARCH" in
+	s390*) ;;
+	*) rm -f %{buildroot}/usr/lib/sysctl.d/50-default-s390.conf ;;
+esac
+#
 # make sure it does not creep in again
 test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
 #
@@ -126,6 +132,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %files
 %defattr(-,root,root)
 %doc COPYING
+%config(noreplace) %ghost /etc/sysctl.conf
 %config /etc/bash.bashrc
 %config /etc/csh.cshrc
 %config /etc/csh.login
@@ -197,6 +204,9 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /usr/share/man/man8/safe-rm.8*
 /usr/share/man/man8/safe-rmdir.8*
 /usr/share/man/man8/service.8*
+%dir /etc/sysctl.d
+%dir /usr/lib/sysctl.d
+/usr/lib/sysctl.d/*.conf
 /var/adm/fillup-templates/sysconfig.backup
 /var/adm/fillup-templates/sysconfig.boot
 /var/adm/fillup-templates/sysconfig.clock