- Update to version 84.87+git20220321.f60f2de:

* order header in the way spec-cleaner wants it
  * move changes from package to git
  * merge audio files highlighting fixes from coreutils 9
  * Update from coreutils 9
  * Make source validator happy

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

.gitattributes

@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+aaa_base-84.87+git20220321.f60f2de.tar filter=lfs diff=lfs merge=lfs -text

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="version">84.87</param>
     <param name="versionformat">84.87+git%cd.%h</param>
     <param name="url">https://github.com/openSUSE/aaa_base.git</param>
@@ -9,9 +9,5 @@
     <param name="extract">aaa_base-rpmlintrc</param>
     <param name="extract">README.packaging.txt</param>
   </service>
-   <service name="recompress" mode="disabled">
-     <param name="compression">zstd</param>
-     <param name="file">*.tar</param>
-   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
 </services>

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">0ab4d8945b891fdb0c0162f7064cdde047ced8b2</param></service><service name="tar_scm">
+              <param name="changesrevision">d239b9fc8f7ae644873bd97036fd0e44d9dd9933</param></service><service name="tar_scm">
                 <param name="url">https://github.com/lnussel/aaa_base.git</param>
               <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>

aaa_base-84.87+git20220321.5a5cb79.tar.zst

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

aaa_base-84.87+git20220321.f60f2de.tar

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

aaa_base.changes

@@ -1,9 +1,12 @@
 -------------------------------------------------------------------
-Mon Mar 21 11:40:10 UTC 2022 - Dirk Müller <dmueller@suse.com>
+Mon Mar 21 17:33:26 UTC 2022 - lnussel@suse.de
 
-- remove build-in-place as this breaks factory submission
-- light modernization for spec file ($RPM_BUILD_ROOT -> %%{buildroot} )
-- compressed tar in srpms
+- Update to version 84.87+git20220321.f60f2de:
+  * order header in the way spec-cleaner wants it
+  * move changes from package to git
+  * merge audio files highlighting fixes from coreutils 9
+  * Update from coreutils 9
+  * Make source validator happy
 
 -------------------------------------------------------------------
 Mon Mar 21 10:08:15 UTC 2022 - lnussel@suse.de

aaa_base.spec

@@ -14,6 +14,7 @@
 
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
+# icecream 0
 
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
@@ -21,18 +22,26 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-#%if 0%{?_build_in_place}
-#%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
-#BuildRequires:  git-core
-#%endif
+%if 0%{?_build_in_place}
+%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
+BuildRequires:  git-core
+%else
+# this is required for obs' source validator. It's
+# 20-files-present-and-referenced ignores all conditionals. So the
+# definition of git_version actually happens always.
+%define git_version %{nil}
+%endif
 
 Name:           aaa_base
-Version:        84.87+git20220321.5a5cb79
+Version:        84.87+git20220321.f60f2de%{git_version}
 Release:        0
+Summary:        openSUSE Base Package
+License:        GPL-2.0-or-later
+Group:          System/Fhs
 URL:            https://github.com/openSUSE/aaa_base
-# do not require systemd - aaa_base is in the build environment and we don't
-# want to pull in tons of dependencies
-Conflicts:      sysvinit-init
+Source:         aaa_base-%{version}.tar
+Source1:        README.packaging.txt
+Source99:       aaa_base-rpmlintrc
 Requires:       /bin/mktemp
 Requires:       /usr/bin/cat
 Requires:       /usr/bin/date
@@ -43,28 +52,20 @@ Requires:       /usr/bin/tput
 Requires:       /usr/bin/xz
 Requires:       distribution-release
 Requires:       filesystem
+Requires(pre):  /usr/bin/rm
+Requires(pre):  (glibc >= 2.30 if glibc)
+Requires(post): fillup /usr/bin/chmod /usr/bin/chown
 Recommends:     aaa_base-extras
 Recommends:     iproute2
 Recommends:     iputils
 Recommends:     logrotate
 Recommends:     netcfg
 Recommends:     udev
-Requires(pre):  /usr/bin/rm
-Requires(pre):  (glibc >= 2.30 if glibc)
-Requires(post): fillup /usr/bin/chmod /usr/bin/chown
+# do not require systemd - aaa_base is in the build environment and we don't
+# want to pull in tons of dependencies
+Conflicts:      sysvinit-init
 
-Summary:        openSUSE Base Package
-License:        GPL-2.0-or-later
-Group:          System/Fhs
-BuildRequires:  zstd
 # run osc service mr to recreate
-Source:         aaa_base-%{version}.tar.zst
-#
-# Read README.packaging.txt before making any changes to this
-# package
-#
-Source1:        README.packaging.txt
-Source99:       aaa_base-rpmlintrc
 
 %description
 This package installs several important configuration files and central scripts.
@@ -107,12 +108,10 @@ systems.
 %setup -q
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
+%make_build CFLAGS="%{optflags}" CC="%{__cc}"
 
 %install
-#
 %make_install
-#
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
 	s390*) ;;