From 102c0f8cdd5817f18f7c27bc2f470f0d9d9e0b77664ee7f7c42f5aeedbdd9202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 17 Sep 2024 14:38:25 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main fillup revision 0feaa463ed7912e1101e1a401c8946fc --- fillup.changes | 10 ++++++++++ fillup.spec | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/fillup.changes b/fillup.changes index 3958402..599a876 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 26 08:19:08 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +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 diff --git a/fillup.spec b/fillup.spec index ca09b9c..afee5f4 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 @@ -47,13 +47,13 @@ its variable name. %prep %setup -q -%patch0 -%patch1 -p1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -p1 +%patch -P 0 +%patch -P 1 -p1 +%patch -P 2 +%patch -P 3 +%patch -P 4 +%patch -P 5 +%patch -P 6 -p1 %build make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" @@ -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