From c8825f87e2922ff85c0152d5bc0178934653b9d16eef2691abe38cf8fbaaa953 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Tue, 28 Jan 2020 15:12:04 +0000
Subject: [PATCH] Accepting request 768060 from home:kukuk:branches:Base:System

- Adjust Requires/Requires(pre)/Requires(post)
- Update to version 84.87+git20200128.8a17290:
  * Move chkconfig to insserv-compat, as most functionality isn't supported anymore since we have different solutions with systemd.
  * Remove /usr/bin/mkinfodir, not used anywhere anymore

OBS-URL: https://build.opensuse.org/request/show/768060
OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=680
---
 _servicedata                              |  2 +-
 aaa_base-84.87+git20200116.59482ba.tar.xz |  3 ---
 aaa_base-84.87+git20200128.8a17290.tar.xz |  3 +++
 aaa_base.changes                          |  8 ++++++++
 aaa_base.spec                             | 21 +++++++++++----------
 5 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 aaa_base-84.87+git20200116.59482ba.tar.xz
 create mode 100644 aaa_base-84.87+git20200128.8a17290.tar.xz

diff --git a/_servicedata b/_servicedata
index 257521e..0da9711 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">59482ba32863a74633654e883ccab7501327be08</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">864351813765c17ce0684b2404459e500e433172</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20200116.59482ba.tar.xz b/aaa_base-84.87+git20200116.59482ba.tar.xz
deleted file mode 100644
index e01da87..0000000
--- a/aaa_base-84.87+git20200116.59482ba.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afdba55fdc2fb0d97a35256d84efd4faadecfd7c40afb8c8e9b4f507ff6bdc28
-size 70020
diff --git a/aaa_base-84.87+git20200128.8a17290.tar.xz b/aaa_base-84.87+git20200128.8a17290.tar.xz
new file mode 100644
index 0000000..8c5c0ba
--- /dev/null
+++ b/aaa_base-84.87+git20200128.8a17290.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bef93636a1ca6c629adf44412cd74c13943b1e35d9a7ff5a129d3d79c3ec3bd8
+size 61164
diff --git a/aaa_base.changes b/aaa_base.changes
index 4362309..da0e2a6 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 28 14:30:17 UTC 2020 - kukuk@suse.com
+
+- Adjust Requires/Requires(pre)/Requires(post)
+- Update to version 84.87+git20200128.8a17290:
+  * Move chkconfig to insserv-compat, as most functionality isn't supported anymore since we have different solutions with systemd.
+  * Remove /usr/bin/mkinfodir, not used anywhere anymore
+
 -------------------------------------------------------------------
 Thu Jan 16 10:22:27 UTC 2020 - ro@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 3fe63af..89404e8 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -23,22 +23,25 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20200116.59482ba
+Version:        84.87+git20200128.8a17290
 Release:        0
 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
 Requires:       /bin/mktemp
-Requires:       /usr/bin/find
+Requires:       /usr/bin/cat
+Requires:       /usr/bin/date
+Requires:       /usr/bin/grep
+Requires:       /usr/bin/mv
+Requires:       /usr/bin/sed
 Requires:       /usr/bin/tput
-Requires:       /usr/bin/xargs
-Requires:       cpio
 Requires:       distribution-release
 Requires:       filesystem
 Recommends:     logrotate netcfg udev iputils iproute2 aaa_base-extras
-PreReq:         /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date
-Requires(post): fillup
+Requires(pre):  /usr/bin/rm
+Requires(post): fillup /usr/bin/chmod /usr/bin/chown
+
 Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
 Group:          System/Fhs
@@ -59,6 +62,8 @@ This package installs several important configuration files and central scripts.
 Summary:        SUSE Linux Base Package (recommended part)
 Group:          System/Fhs
 Requires:       %{name} = %{version}
+Requires:       /usr/bin/find
+Requires:       cpio
 Requires(post): fillup
 Provides:       aaa_base:/etc/DIR_COLORS
 
@@ -190,8 +195,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 # and /etc/permissions!
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 /etc/hushlogins
-/usr/bin/chkconfig
-/sbin/chkconfig
 /usr/bin/get_kernel_version
 /sbin/refresh_initrd
 /usr/sbin/refresh_initrd
@@ -200,7 +203,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 /sbin/smart_agetty
 /usr/sbin/smart_agetty
 /usr/bin/filesize
-/usr/bin/mkinfodir
 /usr/bin/old
 /usr/bin/rpmlocate
 /usr/bin/safe-rm
@@ -209,7 +211,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 /usr/sbin/sysconf_addword
 /usr/share/man/man1/smart_agetty.1*
 /usr/share/man/man5/defaultdomain.5*
-/usr/share/man/man8/chkconfig.8*
 /usr/share/man/man8/safe-rm.8*
 /usr/share/man/man8/safe-rmdir.8*
 /usr/share/man/man8/service.8*