From 0ea71537756bfc6cdc89542c52c108cdf047705b5af0aa6ea35c868e1f174d62 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Mon, 15 Apr 2024 15:50:01 +0000
Subject: [PATCH] - Update to version 84.87+git20240415.e6815bf:   * drop
 obsolete 50-default-s390.conf (bsc#1211721)   * fix typo in alljava.csh and
 drop stderr redirection

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=778
---
 .gitattributes                         | 2 +-
 _servicedata                           | 2 +-
 aaa_base-84.87+git20240402.16596d1.tar | 3 ---
 aaa_base-84.87+git20240415.e6815bf.tar | 3 +++
 aaa_base.changes                       | 7 +++++++
 aaa_base.spec                          | 6 +-----
 6 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100644 aaa_base-84.87+git20240402.16596d1.tar
 create mode 100644 aaa_base-84.87+git20240415.e6815bf.tar

diff --git a/.gitattributes b/.gitattributes
index cf99e37..02eaef2 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+git20240402.16596d1.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20240415.e6815bf.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_servicedata b/_servicedata
index 36fc07b..d4cb924 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">16596d17483312de0934304bb6ed0ae0beaa1834</param></service><service name="tar_scm">
+              <param name="changesrevision">e6815bfc5137556aee3b5752f15ca484c88e513b</param></service><service name="tar_scm">
                 <param name="url">https://github.com/lnussel/aaa_base.git</param>
               <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20240402.16596d1.tar b/aaa_base-84.87+git20240402.16596d1.tar
deleted file mode 100644
index 6d39636..0000000
--- a/aaa_base-84.87+git20240402.16596d1.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:022bb5a7d1666fcca2f4b34a57bfa22981a74cb3b5950f4ff749b9444c0f0788
-size 358400
diff --git a/aaa_base-84.87+git20240415.e6815bf.tar b/aaa_base-84.87+git20240415.e6815bf.tar
new file mode 100644
index 0000000..f6affc8
--- /dev/null
+++ b/aaa_base-84.87+git20240415.e6815bf.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea3ac7a02d928b5ed56464a2c18c78d752a273b9b34f1b97dc43dea0ef055293
+size 358400
diff --git a/aaa_base.changes b/aaa_base.changes
index d83cae1..7f8b1f8 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 15 15:49:43 UTC 2024 - lnussel@suse.com
+
+- Update to version 84.87+git20240415.e6815bf:
+  * drop obsolete 50-default-s390.conf (bsc#1211721)
+  * fix typo in alljava.csh and drop stderr redirection
+
 -------------------------------------------------------------------
 Tue Apr 02 11:16:55 UTC 2024 - lnussel@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index aea6d3c..bf12978 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -33,7 +33,7 @@ BuildRequires:  git-core
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20240402.16596d1%{git_version}
+Version:        84.87+git20240415.e6815bf%{git_version}
 Release:        0
 Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
@@ -112,10 +112,6 @@ systems.
 %install
 %make_install
 mkdir -p %{buildroot}/etc/sysctl.d
-case "$RPM_ARCH" in
-	s390*) ;;
-	*) rm -f %{buildroot}/usr/lib/sysctl.d/50-default-s390.conf ;;
-esac
 #
 # make sure it does not creep in again
 test -d %{buildroot}/root/.gnupg && exit 1