From ab0730bc9640cc26095189890b43c821e2b8ed86 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 24 Apr 2019 13:32:35 +0000 Subject: [PATCH] Accepting request 695792 from home:kukuk:branches:Base:System - Update to version 84.87+git20190418.d83e9d6: * convert_sysctl isn't needed anymore - Update to version 84.87+git20190418.f488c70: * Remove sysconfig/sysctl to sysctl.conf merge, there is no active distribution anymore from which we support an update with this. - Update to version 84.87+git20190418.155e7f0: * Remove sysconfig/cron to tmpfiles, we don't support upgrade from such old distributions to Factory anymore. * /etc/sysconfig/boot and /etc/sysconfig/shutdown don't exist anymore, no need to remove single variables from it. * Remove obsolete code for /etc/psdevtab and YaST - Remove over 12 year old compat provides - Remove BuildRequires for net-tools, the code was removed and this package does not contain the wanted tool anymore - Replace net-tools with successors in Recommends OBS-URL: https://build.opensuse.org/request/show/695792 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=648 --- _servicedata | 2 +- aaa_base-84.87+git20190418.a543e8e.tar.xz | 3 --- aaa_base-84.87+git20190418.d83e9d6.tar.xz | 3 +++ aaa_base.changes | 31 +++++++++++++++++++++++ aaa_base.spec | 23 +++++------------ 5 files changed, 41 insertions(+), 21 deletions(-) delete mode 100644 aaa_base-84.87+git20190418.a543e8e.tar.xz create mode 100644 aaa_base-84.87+git20190418.d83e9d6.tar.xz diff --git a/_servicedata b/_servicedata index bf39dc8..3dd9ba2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/aaa_base.git - a543e8e7db2a84ba56a6864d640ee68518cb116c \ No newline at end of file + d83e9d67c6cf097f2e21460a4163766ab8322a77 \ No newline at end of file diff --git a/aaa_base-84.87+git20190418.a543e8e.tar.xz b/aaa_base-84.87+git20190418.a543e8e.tar.xz deleted file mode 100644 index 1c6dda1..0000000 --- a/aaa_base-84.87+git20190418.a543e8e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fee23778a79887da96207b644f402db6fe388aa3fab07fe71265469c19cc9d9 -size 70812 diff --git a/aaa_base-84.87+git20190418.d83e9d6.tar.xz b/aaa_base-84.87+git20190418.d83e9d6.tar.xz new file mode 100644 index 0000000..566e062 --- /dev/null +++ b/aaa_base-84.87+git20190418.d83e9d6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:765fb70d52f50fa36e7ceda271cc6b9552ece52c979bd2e184d664671017a1f8 +size 69436 diff --git a/aaa_base.changes b/aaa_base.changes index b81fa2e..aa4aef9 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Apr 18 14:25:19 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.d83e9d6: + * convert_sysctl isn't needed anymore + +------------------------------------------------------------------- +Thu Apr 18 14:13:03 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.f488c70: + * Remove sysconfig/sysctl to sysctl.conf merge, there is no active + distribution anymore from which we support an update with this. + +------------------------------------------------------------------- +Thu Apr 18 13:11:28 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.155e7f0: + * Remove sysconfig/cron to tmpfiles, we don't support upgrade from + such old distributions to Factory anymore. + * /etc/sysconfig/boot and /etc/sysconfig/shutdown don't exist anymore, + no need to remove single variables from it. + * Remove obsolete code for /etc/psdevtab and YaST + +------------------------------------------------------------------- +Thu Apr 18 11:00:00 CEST 2019 - kukuk@suse.de + +- Remove over 12 year old compat provides +- Remove BuildRequires for net-tools, the code was removed and this + package does not contain the wanted tool anymore +- Replace net-tools with successors in Recommends + ------------------------------------------------------------------- Thu Apr 18 07:57:23 UTC 2019 - kukuk@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index 81a00c0..ba0f044 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -23,18 +23,11 @@ %endif Name: aaa_base -Version: 84.87+git20190418.a543e8e +Version: 84.87+git20190418.d83e9d6 Release: 0 Url: https://github.com/openSUSE/aaa_base -Provides: aaa_skel = %{version}-%{release} -Provides: bin -Provides: bootutls -Provides: etc -Provides: skeleng -Provides: skelger -Obsoletes: aaa_skel < %{version} -# do not require systemd - aaa_base is in the build environment and we don't want -# to pull in tons of dependencies +# 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/login Requires: /bin/mktemp @@ -44,10 +37,7 @@ Requires: /usr/bin/xargs Requires: cpio Requires: distribution-release Requires: filesystem -# for symlink check to /bin/hostname -BuildRequires: net-tools -BuildRequires: xz -Recommends: logrotate netcfg udev net-tools aaa_base-extras +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 Summary: openSUSE Base Package @@ -173,7 +163,7 @@ mkdir -p %{buildroot}%{_fillupdir} %files %defattr(-,root,root) %license COPYING -%config(noreplace) %ghost /etc/sysctl.conf +%config(noreplace) /etc/sysctl.conf %config /etc/bash.bashrc %config /etc/csh.cshrc %config /etc/csh.login @@ -216,8 +206,6 @@ mkdir -p %{buildroot}%{_fillupdir} /usr/bin/rpmlocate /usr/bin/safe-rm /usr/bin/safe-rmdir -%dir /usr/lib/base-scripts -/usr/lib/base-scripts/convert_sysctl /usr/lib/restricted/bin/hostname /usr/sbin/sysconf_addword /usr/share/man/man1/smart_agetty.1* @@ -245,6 +233,7 @@ mkdir -p %{buildroot}%{_fillupdir} /etc/profile.d/ls.tcsh /etc/profile.d/ls.bash /etc/profile.d/ls.zsh +%dir /usr/lib/base-scripts /usr/lib/base-scripts/backup-rpmdb /usr/lib/base-scripts/backup-sysconfig /usr/lib/base-scripts/check-battery