rpm/fillup
SHA256
1
0
Fork 0
forked from pool/fillup
Code Pull Requests Activity

Accepting request 849596 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849596
OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=28
This commit is contained in:
Adam Majer 2020-11-20 12:41:15 +00:00 committed by Git OBS Bridge
parent 6507a74fc2
commit 176dd44bf3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fillup.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Wed Jan 15 09:38:33 UTC 2020 - Adam Majer <adam.majer@suse.de>

11
fillup.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package fillup
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,7 @@ Release: 0
Summary: Tool for Merging Config Files
License: GPL-2.0-or-later
Group: System/Base
Url: http://github.com/openSUSE/fillup
URL: http://github.com/openSUSE/fillup
Source: fillup-%{version}.tar.bz2
Patch0: fillup-optflags.patch
Patch1: fillup-warnings.dif
@ -65,11 +65,12 @@ install -m 755 BIN/fillup %{buildroot}/%{_bindir}
install -d %{buildroot}/%{_mandir}/man8
install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8
#UsrMerge - There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro)
%if !0%{?usrmerged}
# 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
ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin
#EndUserMerge
%endif
%check
make %{?_smp_mflags} test OPTISPLUS="%{optflags}"
@ -77,7 +78,9 @@ make %{?_smp_mflags} test OPTISPLUS="%{optflags}"
%files
%defattr(-,root,root)
# rpm scriptlets still use this, based on %*fillup* macros
%if !0%{?usrmerged}
/bin/fillup
%endif
%{_bindir}/fillup
%{_mandir}/man8/fillup*