From 2b26ce219bcb0a46713ab84d8aaee2a8d98f7a6a8dcf06eb07780b8e25c8e917 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 17 Oct 2019 13:29:12 +0000 Subject: [PATCH 1/3] Accepting request 739553 from home:RBrownSUSE:branches:Apache Remove obsolete Groups tag (fate#326485) OBS-URL: https://build.opensuse.org/request/show/739553 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros-control?expand=0&rev=5 --- apache-rpm-macros-control.changes | 5 +++++ apache-rpm-macros-control.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apache-rpm-macros-control.changes b/apache-rpm-macros-control.changes index 9533834..0860928 100644 --- a/apache-rpm-macros-control.changes +++ b/apache-rpm-macros-control.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 13:18:50 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + ------------------------------------------------------------------- Fri Dec 18 23:37:37 UTC 2015 - opensuse@cboltz.de diff --git a/apache-rpm-macros-control.spec b/apache-rpm-macros-control.spec index ec52498..3509d89 100644 --- a/apache-rpm-macros-control.spec +++ b/apache-rpm-macros-control.spec @@ -1,7 +1,7 @@ # # spec file for package apache-rpm-macros-control # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,7 +26,6 @@ Version: 20151110 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Url: http://httpd.apache.org/ Source1: macros.apache-control BuildRoot: %{_tmppath}/%{name}-%{version}-build From 2d7482d3c5af0afccf66ac88c204f952059156d2866f985e76cb58dc9c7a94ee Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 18 Oct 2019 09:15:59 +0000 Subject: [PATCH 2/3] Accepting request 741011 from openSUSE:Factory revert OBS-URL: https://build.opensuse.org/request/show/741011 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros-control?expand=0&rev=6 --- apache-rpm-macros-control.changes | 5 ----- apache-rpm-macros-control.spec | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apache-rpm-macros-control.changes b/apache-rpm-macros-control.changes index 0860928..9533834 100644 --- a/apache-rpm-macros-control.changes +++ b/apache-rpm-macros-control.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 17 13:18:50 UTC 2019 - Richard Brown - -- Remove obsolete Groups tag (fate#326485) - ------------------------------------------------------------------- Fri Dec 18 23:37:37 UTC 2015 - opensuse@cboltz.de diff --git a/apache-rpm-macros-control.spec b/apache-rpm-macros-control.spec index 3509d89..ec52498 100644 --- a/apache-rpm-macros-control.spec +++ b/apache-rpm-macros-control.spec @@ -1,7 +1,7 @@ # # spec file for package apache-rpm-macros-control # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -26,6 +26,7 @@ Version: 20151110 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 +Group: Productivity/Networking/Web/Servers Url: http://httpd.apache.org/ Source1: macros.apache-control BuildRoot: %{_tmppath}/%{name}-%{version}-build From e8065efc596a49c1b19605667fed54b6c6634274db9a93727780bf64ddb875e7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 25 Nov 2019 08:58:26 +0000 Subject: [PATCH 3/3] Accepting request 750622 from home:Pharaoh_Atem:libexecdir - Replace incorrect usage of %_libexecdir/rpm with %_rpmconfigdir OBS-URL: https://build.opensuse.org/request/show/750622 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros-control?expand=0&rev=7 --- apache-rpm-macros-control.changes | 5 +++++ apache-rpm-macros-control.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-rpm-macros-control.changes b/apache-rpm-macros-control.changes index 9533834..70036fa 100644 --- a/apache-rpm-macros-control.changes +++ b/apache-rpm-macros-control.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 24 17:42:16 UTC 2019 - Neal Gompa + +- Replace incorrect usage of %_libexecdir/rpm with %_rpmconfigdir + ------------------------------------------------------------------- Fri Dec 18 23:37:37 UTC 2015 - opensuse@cboltz.de diff --git a/apache-rpm-macros-control.spec b/apache-rpm-macros-control.spec index ec52498..7fbf222 100644 --- a/apache-rpm-macros-control.spec +++ b/apache-rpm-macros-control.spec @@ -17,7 +17,7 @@ %if 0%{?suse_version} > 1230 -%define macros_dir %{_libexecdir}/rpm/macros.d +%define macros_dir %{_rpmconfigdir}/macros.d %else %define macros_dir %{_sysconfdir}/rpm %endif