OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=742

.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+git20211201.2eab642.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20211124.5486aad.tar filter=lfs diff=lfs merge=lfs -text

README.packaging.txt

@@ -1,10 +1,15 @@
-This package is maintained in git at
+This package should use just the content of the git tree. If you need
+to make changes, you have the following options:
+* Make them in git and update the package from git (you can send merge
+  request if you don't have write access)
+* Create a patch, add the patch to the package and let one of the
+  aaa_base packagers commit it for you
+
+The online repository is at:
 http://github.com/openSUSE/aaa_base
 
-Please file a pull request for any changes. The spec file is also in
-git.
+For building the package from git run the service directly:
+osc service disabledrun
 
-For building the package from git you have to adjust the _service
-file to point at the right branch, then call
-
-osc service manualrun
+Note that aaa_base.spec and aaa_base.changes are not part of the git
+repo.

_service

@@ -5,9 +5,6 @@
     <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>
-    <param name="extract">aaa_base-rpmlintrc</param>
-    <param name="extract">README.packaging.txt</param>
   </service>
   <service name="set_version" mode="manual"/>
 </services>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">1e0c192fd0c70956520671d5b370459a0b452af8</param></service></servicedata>
+              <param name="changesrevision">5486aadee23a19422cc54064dc6c95ee47f87cf8</param></service></servicedata>

aaa_base-84.87+git20211124.5486aad.tar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e5c1c65911a684de5217c15a6b66cf179eb43b19db3635df171a9c06b981aa0
+size 368640

aaa_base-84.87+git20211201.2eab642.tar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae603507180f6167c081f8a4c939288ee09e935d7ea223cef0cdc3986c4672b5
-size 378880

aaa_base.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Wed Dec 01 11:54:55 UTC 2021 - lnussel@suse.de
-
-- Update to version 84.87+git20211201.2eab642:
-  * 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
-  * Get spec file from git
-
 -------------------------------------------------------------------
 Thu Nov 25 07:16:25 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 

aaa_base.spec

@@ -23,7 +23,7 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20211201.2eab642
+Version:        84.87+git20211124.5486aad
 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,6 +118,9 @@ 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
@@ -230,6 +233,11 @@ 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)