testing/fillup
SHA256
3
0
Fork 0
forked from pool/fillup
Code Pull Requests Activity

Accepting request 259499 from Base:System

Browse Source 
- Also return back the /bin/fillup provides line

- Keep /bin/fillup as a symlink in the package: there are hundreds
  of RPMs out there referencing it in the %post scriptlets, when
  any of the %*fillup* macros was used. Even updating the macro
  will not make the existing RPMs magically be fixed.

- Cleanup the mess in spec with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/259499
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillup?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2014-11-07 13:07:13 +00:00 committed by Git OBS Bridge
commit 20fa8fd7d8
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fillup.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Nov 3 13:09:25 UTC 2014 - tchvatal@suse.com
- Also return back the /bin/fillup provides line
-------------------------------------------------------------------
Fri Oct 31 12:02:57 UTC 2014 - dimstar@opensuse.org
- Keep /bin/fillup as a symlink in the package: there are hundreds
of RPMs out there referencing it in the %post scriptlets, when
any of the %*fillup* macros was used. Even updating the macro
will not make the existing RPMs magically be fixed.
-------------------------------------------------------------------
Sun Oct 26 09:10:04 UTC 2014 - tchvatal@suse.com
- Cleanup the mess in spec with spec-cleaner
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 13:08:55 UTC 2012 - rschweikert@suse.com Wed Feb 8 13:08:55 UTC 2012 - rschweikert@suse.com

60
fillup.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fillup # spec file for package fillup
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# 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
@ -17,21 +17,21 @@
Name: fillup Name: fillup
Provides: aaa_base:/bin/fillup
Version: 1.42 Version: 1.42
Release: 0 Release: 0
Summary: Tool for Merging Config Files Summary: Tool for Merging Config Files
License: GPL-2.0+ License: GPL-2.0+
Group: System/Base Group: System/Base
Url: http://github.com/openSUSE/fillup
Source: fillup-%{version}.tar.bz2 Source: fillup-%{version}.tar.bz2
Patch: fillup-optflags.patch Patch0: fillup-optflags.patch
Patch1: fillup-warnings.dif Patch1: fillup-warnings.dif
Patch2: fillup-%{version}.dif Patch2: fillup-%{version}.dif
Patch3: fillup-retval.dif Patch3: fillup-retval.dif
Patch4: fillup-nodate.patch Patch4: fillup-nodate.patch
Patch5: fillup-1.42-cloexec.patch Patch5: fillup-1.42-cloexec.patch
Provides: aaa_base:/bin/fillup
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool.
%description %description
fillup merges files that hold variables. A variable is defined by an fillup merges files that hold variables. A variable is defined by an
@ -41,54 +41,36 @@ its variable name.
%prep %prep
%setup -q %setup -q
%patch %patch0
%patch1 -p1 %patch1 -p1
%patch2 -p0 %patch2
%patch3 -p0 %patch3
%patch4 -p0 %patch4
%patch5 %patch5
%build %build
# make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}"
# Be sure that the tests for fillup are run in
# DEBUG mode for comparision with the references
#
# build time testing disabled when cross-compiling
%if !0%{?_crossbuild}
make %{?_smp_mflags} clean
make %{?_smp_mflags} test OPTISPLUS="$RPM_OPT_FLAGS"
#
# For the real world make clean and use the
# optimzed version.
#
make %{?_smp_mflags} clean
%else
# build system does not always honor CC; workaround:
echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >gcc
chmod 755 gcc
export PATH=`pwd`:$PATH
%endif
make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" CC="%__cc"
%install %install
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
# install -d -m 755 %{buildroot}/%{_bindir}
# install fillup install -m 755 BIN/fillup %{buildroot}/%{_bindir}
# install -d %{buildroot}/%{_mandir}/man8
install -d -m 755 $RPM_BUILD_ROOT/%{_bindir} install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8
install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir}
#UsrMerge #UsrMerge - 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 install -d -m 755 $RPM_BUILD_ROOT/bin
ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin
#EndUserMerge #EndUserMerge
install -d $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 %check
make %{?_smp_mflags} test OPTISPLUS="%{optflags}"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
#UsrMerge # rpm scriptlets still use this, based on %*fillup* macros
/bin/fillup /bin/fillup
#EndUserMerge
%{_bindir}/fillup %{_bindir}/fillup
%{_mandir}/man8/fillup* %{_mandir}/man8/fillup*