Sync from SUSE:SLFO:Main fillup revision 0feaa463ed7912e1101e1a401c8946fc

This commit is contained in:
Adrian Schröter 2024-09-17 14:38:25 +02:00
parent f14dd17c4e
commit 102c0f8cdd
2 changed files with 20 additions and 10 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 26 08:19:08 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Wed Jan 17 17:32:18 UTC 2024 - Dirk Müller <dmueller@suse.com>
- remove bin symlink for non-suse distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 27 10:36:20 UTC 2022 - Ludwig Nussel <lnussel@suse.com> Tue Dec 27 10:36:20 UTC 2022 - Ludwig Nussel <lnussel@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package fillup # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -47,13 +47,13 @@ its variable name.
%prep %prep
%setup -q %setup -q
%patch0 %patch -P 0
%patch1 -p1 %patch -P 1 -p1
%patch2 %patch -P 2
%patch3 %patch -P 3
%patch4 %patch -P 4
%patch5 %patch -P 5
%patch6 -p1 %patch -P 6 -p1
%build %build
make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" 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 -d %{buildroot}/%{_mandir}/man8
install -m 644 SGML/fillup.8.gz %{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) # 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) # So let's at least keep the symlink there for now (DimStar - 2014-10-31)
install -d -m 755 $RPM_BUILD_ROOT/bin install -d -m 755 $RPM_BUILD_ROOT/bin
@ -79,7 +79,7 @@ make test OPTISPLUS="%{optflags}"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
# rpm scriptlets still use this, based on %*fillup* macros # rpm scriptlets still use this, based on %*fillup* macros
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} && 0%{?suse_version} < 1550
/bin/fillup /bin/fillup
%endif %endif
%{_bindir}/fillup %{_bindir}/fillup