From dcf79cebfa694409c3e11a88d1d775da8137a7df Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 11 Dec 2021 16:07:20 +0000
Subject: [PATCH] - Update to version 84.87+git20211206.de24bdf:   * Add "rpm"
 make target   * Remove legacy usrmerged sections   * Add rpmlintrc and README
 from OBS too   * Fix osc service instructions   * Add obs workflow for git
 integration   * Adopt upstream way of setting rp_filter and
 promote_secondaries   * Don't fail if net.ipv4.ping_group_range can't be set 
  * add spec file

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=743
---
 .gitattributes                         |  2 +-
 _service                               |  1 +
 _servicedata                           |  2 +-
 aaa_base-84.87+git20211124.5486aad.tar |  3 ---
 aaa_base-84.87+git20211206.de24bdf.tar |  3 +++
 aaa_base.changes                       | 13 +++++++++++++
 aaa_base.spec                          | 10 +---------
 7 files changed, 20 insertions(+), 14 deletions(-)
 delete mode 100644 aaa_base-84.87+git20211124.5486aad.tar
 create mode 100644 aaa_base-84.87+git20211206.de24bdf.tar

diff --git a/.gitattributes b/.gitattributes
index c48b9a2..7ca3a65 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,4 +22,4 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
-aaa_base-84.87+git20211124.5486aad.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20211206.de24bdf.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
index f6a7b90..2114ad4 100644
--- a/_service
+++ b/_service
@@ -5,6 +5,7 @@
     <param name="url">https://github.com/openSUSE/aaa_base.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
+    <param name="extract">aaa_base.spec</param>
   </service>
   <service name="set_version" mode="manual"/>
 </services>
diff --git a/_servicedata b/_servicedata
index d51dc5f..ae32142 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">5486aadee23a19422cc54064dc6c95ee47f87cf8</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">7fc8c1190fae5b0db879b4080aef7e51961524cd</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20211124.5486aad.tar b/aaa_base-84.87+git20211124.5486aad.tar
deleted file mode 100644
index d3b7813..0000000
--- a/aaa_base-84.87+git20211124.5486aad.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e5c1c65911a684de5217c15a6b66cf179eb43b19db3635df171a9c06b981aa0
-size 368640
diff --git a/aaa_base-84.87+git20211206.de24bdf.tar b/aaa_base-84.87+git20211206.de24bdf.tar
new file mode 100644
index 0000000..08400f8
--- /dev/null
+++ b/aaa_base-84.87+git20211206.de24bdf.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7c19a25835b26d1f45483eb3a8c51f6f2e29326b3b4797f1da31d6ce7e26c89
+size 378880
diff --git a/aaa_base.changes b/aaa_base.changes
index e6009cc..0e6f4c4 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Dec 11 16:05:25 UTC 2021 - dleuenberger@suse.com
+
+- Update to version 84.87+git20211206.de24bdf:
+  * Add "rpm" make target
+  * Remove legacy usrmerged sections
+  * Add rpmlintrc and README from OBS too
+  * Fix osc service instructions
+  * Add obs workflow for git integration
+  * Adopt upstream way of setting rp_filter and promote_secondaries
+  * Don't fail if net.ipv4.ping_group_range can't be set
+  * add spec file
+
 -------------------------------------------------------------------
 Thu Nov 25 07:16:25 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 98f2689..df00556 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20211124.5486aad
+Version:        84.87+git20211206.de24bdf
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -118,9 +118,6 @@ fi
 %install
 #
 make DESTDIR=$RPM_BUILD_ROOT install
-%if 0%{?usrmerged}
-rm -f %{buildroot}/sbin/*
-%endif
 #
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
@@ -233,11 +230,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
 %{_fillupdir}/sysconfig.windowmanager
-%if !0%{?usrmerged}
-/sbin/service
-/sbin/refresh_initrd
-/sbin/smart_agetty
-%endif
 
 %files extras
 %defattr(-,root,root)