From ea5e6ea38df58464c7b84fb6f53100ba77f75ee90b233e8d51973c3712c2444b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 29 Jan 2024 12:38:11 +0000 Subject: [PATCH 1/2] Accepting request 1139525 from home:dirkmueller:Factory - remove bin symlink for non-suse distributions - use https as url - Replace references to /var/adm/fillup-templates with new - fix missing return value in test-code (#139594) - silence some compiler warnings (#95370) - additional Keyword: PreSaveCommand - update to 1.38 with additional MetaData keywords - switch behaviour to "fixed sequence of metadata" (#25119) - fix watchdog for removal part (factor 2 needed) - update to 1.22 (avoid possible infinite loop on failure) (#24648) - fix for stale comment when removing variable (#24540) - added install-info macros - update to 1.20 beta (aka prototype) - split off aaa_base OBS-URL: https://build.opensuse.org/request/show/1139525 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=36 --- fillup.changes | 33 +++++++++++++++++++-------------- fillup.spec | 6 +++--- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/fillup.changes b/fillup.changes index 3958402..509f682 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 17 17:32:18 UTC 2024 - Dirk Müller + +- remove bin symlink for non-suse distributions + ------------------------------------------------------------------- Tue Dec 27 10:36:20 UTC 2022 - Ludwig Nussel @@ -11,7 +16,7 @@ Wed Aug 24 10:45:42 UTC 2022 - Andreas Schwab ------------------------------------------------------------------- Wed Apr 27 10:14:27 UTC 2022 - Dirk Müller -- use https as url +- use https as url ------------------------------------------------------------------- Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel @@ -27,7 +32,7 @@ Wed Jan 15 09:38:33 UTC 2020 - Adam Majer ------------------------------------------------------------------- Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- @@ -110,7 +115,7 @@ Wed Jan 25 21:30:12 CET 2006 - mls@suse.de ------------------------------------------------------------------- Wed Jan 11 19:14:17 CET 2006 - ro@suse.de -- fix missing return value in test-code (#139594) +- fix missing return value in test-code (#139594) ------------------------------------------------------------------- Fri Sep 2 13:20:59 CEST 2005 - werner@suse.de @@ -124,7 +129,7 @@ Fri Sep 2 13:20:59 CEST 2005 - werner@suse.de ------------------------------------------------------------------- Wed Jul 27 15:52:42 CEST 2005 - ro@suse.de -- silence some compiler warnings (#95370) +- silence some compiler warnings (#95370) ------------------------------------------------------------------- Tue Jun 28 01:27:23 CEST 2005 - ro@suse.de @@ -152,18 +157,18 @@ Mon Oct 20 01:43:48 CEST 2003 - ro@suse.de Thu Sep 11 18:11:16 CEST 2003 - ro@suse.de - update to 1.42 (#30279) - + ------------------------------------------------------------------- Mon Aug 25 16:18:41 CEST 2003 - ro@suse.de - update to 1.41 -- additional Keyword: PreSaveCommand +- additional Keyword: PreSaveCommand ------------------------------------------------------------------- Thu Aug 14 14:48:23 CEST 2003 - ro@suse.de -- update to 1.38 with additional MetaData keywords +- update to 1.38 with additional MetaData keywords ------------------------------------------------------------------- Mon Jun 16 14:31:46 CEST 2003 - kukuk@suse.de @@ -179,23 +184,23 @@ Wed Mar 12 21:33:38 CET 2003 - ro@suse.de ------------------------------------------------------------------- Wed Mar 12 14:14:51 CET 2003 - ro@suse.de -- switch behaviour to "fixed sequence of metadata" (#25119) +- switch behaviour to "fixed sequence of metadata" (#25119) ------------------------------------------------------------------- Sun Mar 9 20:57:43 CET 2003 - ro@suse.de -- fix watchdog for removal part (factor 2 needed) +- fix watchdog for removal part (factor 2 needed) (fix for reopened #24648) ------------------------------------------------------------------- Thu Mar 6 17:29:16 CET 2003 - ro@suse.de -- update to 1.22 (avoid possible infinite loop on failure) (#24648) +- update to 1.22 (avoid possible infinite loop on failure) (#24648) ------------------------------------------------------------------- Thu Mar 6 14:43:33 CET 2003 - ro@suse.de -- fix for stale comment when removing variable (#24540) +- fix for stale comment when removing variable (#24540) ------------------------------------------------------------------- Wed Feb 19 10:59:08 CET 2003 - ro@suse.de @@ -206,12 +211,12 @@ Wed Feb 19 10:59:08 CET 2003 - ro@suse.de ------------------------------------------------------------------- Thu Feb 6 17:13:16 CET 2003 - ro@suse.de -- added install-info macros +- added install-info macros ------------------------------------------------------------------- Thu Nov 28 14:36:50 CET 2002 - ro@suse.de -- update to 1.20 beta (aka prototype) +- update to 1.20 beta (aka prototype) ------------------------------------------------------------------- Mon Nov 11 11:26:13 CET 2002 - ro@suse.de @@ -221,5 +226,5 @@ Mon Nov 11 11:26:13 CET 2002 - ro@suse.de ------------------------------------------------------------------- Mon Aug 12 13:53:04 CEST 2002 - ro@suse.de -- split off aaa_base +- split off aaa_base diff --git a/fillup.spec b/fillup.spec index ca09b9c..0df822c 100644 --- a/fillup.spec +++ b/fillup.spec @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -65,7 +65,7 @@ install -m 755 BIN/fillup %{buildroot}/%{_bindir} install -d %{buildroot}/%{_mandir}/man8 install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8 -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} && 0%{?suse_version} < 1550 # There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) # So let's at least keep the symlink there for now (DimStar - 2014-10-31) install -d -m 755 $RPM_BUILD_ROOT/bin @@ -79,7 +79,7 @@ make test OPTISPLUS="%{optflags}" %files %defattr(-,root,root) # rpm scriptlets still use this, based on %*fillup* macros -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} && 0%{?suse_version} < 1550 /bin/fillup %endif %{_bindir}/fillup From dde1de7f1b517562e93f2d061dbb7e0f5ee47474e75dea33979bd2a20692f7e0 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 29 Jan 2024 14:06:18 +0000 Subject: [PATCH 2/2] revert whitespace changes in .changes M fillup.changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff for working copy: . Index: fillup.changes =================================================================== --- fillup.changes (revision 905bc9864f64fc6513c45d00c77b8225) +++ fillup.changes (working copy) @@ -16,7 +16,7 @@ ------------------------------------------------------------------- Wed Apr 27 10:14:27 UTC 2022 - Dirk Müller -- use https as url +- use https as url ------------------------------------------------------------------- Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel @@ -32,7 +32,7 @@ ------------------------------------------------------------------- Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- @@ -115,7 +115,7 @@ ------------------------------------------------------------------- Wed Jan 11 19:14:17 CET 2006 - ro@suse.de -- fix missing return value in test-code (#139594) +- fix missing return value in test-code (#139594) ------------------------------------------------------------------- Fri Sep 2 13:20:59 CEST 2005 - werner@suse.de @@ -129,7 +129,7 @@ ------------------------------------------------------------------- Wed Jul 27 15:52:42 CEST 2005 - ro@suse.de -- silence some compiler warnings (#95370) +- silence some compiler warnings (#95370) ------------------------------------------------------------------- Tue Jun 28 01:27:23 CEST 2005 - ro@suse.de @@ -157,18 +157,18 @@ Thu Sep 11 18:11:16 CEST 2003 - ro@suse.de - update to 1.42 (#30279) - + ------------------------------------------------------------------- Mon Aug 25 16:18:41 CEST 2003 - ro@suse.de - update to 1.41 -- additional Keyword: PreSaveCommand +- additional Keyword: PreSaveCommand ------------------------------------------------------------------- Thu Aug 14 14:48:23 CEST 2003 - ro@suse.de -- update to 1.38 with additional MetaData keywords +- update to 1.38 with additional MetaData keywords ------------------------------------------------------------------- Mon Jun 16 14:31:46 CEST 2003 - kukuk@suse.de @@ -184,23 +184,23 @@ ------------------------------------------------------------------- Wed Mar 12 14:14:51 CET 2003 - ro@suse.de -- switch behaviour to "fixed sequence of metadata" (#25119) +- switch behaviour to "fixed sequence of metadata" (#25119) ------------------------------------------------------------------- Sun Mar 9 20:57:43 CET 2003 - ro@suse.de -- fix watchdog for removal part (factor 2 needed) +- fix watchdog for removal part (factor 2 needed) (fix for reopened #24648) ------------------------------------------------------------------- Thu Mar 6 17:29:16 CET 2003 - ro@suse.de -- update to 1.22 (avoid possible infinite loop on failure) (#24648) +- update to 1.22 (avoid possible infinite loop on failure) (#24648) ------------------------------------------------------------------- Thu Mar 6 14:43:33 CET 2003 - ro@suse.de -- fix for stale comment when removing variable (#24540) +- fix for stale comment when removing variable (#24540) ------------------------------------------------------------------- Wed Feb 19 10:59:08 CET 2003 - ro@suse.de @@ -211,12 +211,12 @@ ------------------------------------------------------------------- Thu Feb 6 17:13:16 CET 2003 - ro@suse.de -- added install-info macros +- added install-info macros ------------------------------------------------------------------- Thu Nov 28 14:36:50 CET 2002 - ro@suse.de -- update to 1.20 beta (aka prototype) +- update to 1.20 beta (aka prototype) ------------------------------------------------------------------- Mon Nov 11 11:26:13 CET 2002 - ro@suse.de @@ -226,5 +226,5 @@ ------------------------------------------------------------------- Mon Aug 12 13:53:04 CEST 2002 - ro@suse.de -- split off aaa_base - +- split off aaa_base + OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=37 --- fillup.changes | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fillup.changes b/fillup.changes index 509f682..6703709 100644 --- a/fillup.changes +++ b/fillup.changes @@ -16,7 +16,7 @@ Wed Aug 24 10:45:42 UTC 2022 - Andreas Schwab ------------------------------------------------------------------- Wed Apr 27 10:14:27 UTC 2022 - Dirk Müller -- use https as url +- use https as url ------------------------------------------------------------------- Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel @@ -32,7 +32,7 @@ Wed Jan 15 09:38:33 UTC 2020 - Adam Majer ------------------------------------------------------------------- Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- @@ -115,7 +115,7 @@ Wed Jan 25 21:30:12 CET 2006 - mls@suse.de ------------------------------------------------------------------- Wed Jan 11 19:14:17 CET 2006 - ro@suse.de -- fix missing return value in test-code (#139594) +- fix missing return value in test-code (#139594) ------------------------------------------------------------------- Fri Sep 2 13:20:59 CEST 2005 - werner@suse.de @@ -129,7 +129,7 @@ Fri Sep 2 13:20:59 CEST 2005 - werner@suse.de ------------------------------------------------------------------- Wed Jul 27 15:52:42 CEST 2005 - ro@suse.de -- silence some compiler warnings (#95370) +- silence some compiler warnings (#95370) ------------------------------------------------------------------- Tue Jun 28 01:27:23 CEST 2005 - ro@suse.de @@ -157,18 +157,18 @@ Mon Oct 20 01:43:48 CEST 2003 - ro@suse.de Thu Sep 11 18:11:16 CEST 2003 - ro@suse.de - update to 1.42 (#30279) - + ------------------------------------------------------------------- Mon Aug 25 16:18:41 CEST 2003 - ro@suse.de - update to 1.41 -- additional Keyword: PreSaveCommand +- additional Keyword: PreSaveCommand ------------------------------------------------------------------- Thu Aug 14 14:48:23 CEST 2003 - ro@suse.de -- update to 1.38 with additional MetaData keywords +- update to 1.38 with additional MetaData keywords ------------------------------------------------------------------- Mon Jun 16 14:31:46 CEST 2003 - kukuk@suse.de @@ -184,23 +184,23 @@ Wed Mar 12 21:33:38 CET 2003 - ro@suse.de ------------------------------------------------------------------- Wed Mar 12 14:14:51 CET 2003 - ro@suse.de -- switch behaviour to "fixed sequence of metadata" (#25119) +- switch behaviour to "fixed sequence of metadata" (#25119) ------------------------------------------------------------------- Sun Mar 9 20:57:43 CET 2003 - ro@suse.de -- fix watchdog for removal part (factor 2 needed) +- fix watchdog for removal part (factor 2 needed) (fix for reopened #24648) ------------------------------------------------------------------- Thu Mar 6 17:29:16 CET 2003 - ro@suse.de -- update to 1.22 (avoid possible infinite loop on failure) (#24648) +- update to 1.22 (avoid possible infinite loop on failure) (#24648) ------------------------------------------------------------------- Thu Mar 6 14:43:33 CET 2003 - ro@suse.de -- fix for stale comment when removing variable (#24540) +- fix for stale comment when removing variable (#24540) ------------------------------------------------------------------- Wed Feb 19 10:59:08 CET 2003 - ro@suse.de @@ -211,12 +211,12 @@ Wed Feb 19 10:59:08 CET 2003 - ro@suse.de ------------------------------------------------------------------- Thu Feb 6 17:13:16 CET 2003 - ro@suse.de -- added install-info macros +- added install-info macros ------------------------------------------------------------------- Thu Nov 28 14:36:50 CET 2002 - ro@suse.de -- update to 1.20 beta (aka prototype) +- update to 1.20 beta (aka prototype) ------------------------------------------------------------------- Mon Nov 11 11:26:13 CET 2002 - ro@suse.de @@ -226,5 +226,5 @@ Mon Nov 11 11:26:13 CET 2002 - ro@suse.de ------------------------------------------------------------------- Mon Aug 12 13:53:04 CEST 2002 - ro@suse.de -- split off aaa_base +- split off aaa_base