diff --git a/.gitattributes b/.gitattributes index 7f759f6..8d3bf18 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+git20230220.2991cfd.tar filter=lfs diff=lfs merge=lfs -text +aaa_base-84.87+git20230309.04eae92.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index 4056545..a44a5ba 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/aaa_base.git - 2991cfd27d23c66c913fe3f386e7da3f6b69643a + 04eae922a815555a2170d2a3dc022864d04e3863 https://github.com/lnussel/aaa_base.git 0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6 \ No newline at end of file diff --git a/aaa_base-84.87+git20230220.2991cfd.tar b/aaa_base-84.87+git20230220.2991cfd.tar deleted file mode 100644 index b6b0a81..0000000 --- a/aaa_base-84.87+git20230220.2991cfd.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2848b9bafb2bedf18169cb1903e885c8607f5569962e85cbb3821bf3fb7096b -size 378880 diff --git a/aaa_base-84.87+git20230309.04eae92.tar b/aaa_base-84.87+git20230309.04eae92.tar new file mode 100644 index 0000000..161a8ab --- /dev/null +++ b/aaa_base-84.87+git20230309.04eae92.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:114cbaa732c72bf95eaf39cb80c092afdd546cda1f0110c03acf29c3e245c757 +size 378880 diff --git a/aaa_base.changes b/aaa_base.changes index 0823c22..338dbed 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 09 14:47:56 UTC 2023 - lnussel@suse.de + +- Update to version 84.87+git20230309.04eae92: + * Add conditional glibc requirement back + * Keep owning /etc/sysctl.conf to avoid rpmsave + ------------------------------------------------------------------- Mon Feb 20 17:07:58 UTC 2023 - lnussel@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 51d6bc3..cf27384 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -33,7 +33,7 @@ BuildRequires: git-core %endif Name: aaa_base -Version: 84.87+git20230220.2991cfd%{git_version} +Version: 84.87+git20230309.04eae92%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -52,6 +52,7 @@ Requires: /usr/bin/tput Requires: /usr/bin/xz Requires: distribution-release Requires: filesystem +Requires: (glibc >= 2.30 if glibc) Requires(post): fillup Recommends: aaa_base-extras Recommends: iproute2 @@ -163,6 +164,7 @@ mkdir -p %{buildroot}%{_fillupdir} %files %license COPYING +%ghost %config(noreplace) /etc/sysctl.conf %config /etc/bash.bashrc %config /etc/csh.cshrc %config /etc/csh.login