From 10c6f53df5ccc6cbc455fe3fad4d9982351c84498d0b1ab8f1c192c713abe8ce Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 10 Jul 2014 06:24:44 +0000
Subject: [PATCH] Accepting request 239476 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/239476
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=408
---
 aaa_base-13.2+git20140604.9f4be6e.tar.xz |  3 ---
 aaa_base-13.2+git20140702.7ebaf71.tar.xz |  3 +++
 aaa_base.changes                         |  7 +++++++
 aaa_base.spec                            | 16 +++++++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)
 delete mode 100644 aaa_base-13.2+git20140604.9f4be6e.tar.xz
 create mode 100644 aaa_base-13.2+git20140702.7ebaf71.tar.xz

diff --git a/aaa_base-13.2+git20140604.9f4be6e.tar.xz b/aaa_base-13.2+git20140604.9f4be6e.tar.xz
deleted file mode 100644
index b77baf0..0000000
--- a/aaa_base-13.2+git20140604.9f4be6e.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bd0fc2d94dbad30f3c8d0c60fe4058327cb4d242c00ccf4fe3a19ffd9a1401f
-size 80824
diff --git a/aaa_base-13.2+git20140702.7ebaf71.tar.xz b/aaa_base-13.2+git20140702.7ebaf71.tar.xz
new file mode 100644
index 0000000..fd536f8
--- /dev/null
+++ b/aaa_base-13.2+git20140702.7ebaf71.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:722be1d6a46e24817e2d875173cf6529464de6fb99ead381b702741b9e7cce26
+size 80852
diff --git a/aaa_base.changes b/aaa_base.changes
index f15107f..841ad66 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul  2 10:49:37 UTC 2014 - ro@suse.com
+
+- drop re-creation of before.local and add a comment about not
+  being supported if it had real content (bnc#869177)
+- mark /etc/init.d/{boot,halt,after}.local as ghost (bnc#868416)
+
 -------------------------------------------------------------------
 Tue Jul  1 06:47:54 UTC 2014 - lnussel@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 5468774..47e4bf2 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -17,7 +17,7 @@
 
 
 Name:           aaa_base
-Version:        13.2+git20140604.9f4be6e
+Version:        13.2+git20140702.7ebaf71
 Release:        0
 Url:            https://github.com/openSUSE/aaa_base
 Provides:       aaa_skel = %{version}-%{release}
@@ -113,12 +113,11 @@ 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
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+for i in boot.local after.local halt.local ; do
+  echo "#!bin/bash" > $RPM_BUILD_ROOT/etc/init.d/$i
+  chmod 755 $RPM_BUILD_ROOT/etc/init.d/$i
+done
 #
 install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions
 
@@ -161,6 +160,9 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %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 /etc/init.d/boot.local
+%ghost /etc/init.d/after.local
+%ghost /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