Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2014-11-07 14:07:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fillup" Changes: -------- --- /work/SRC/openSUSE:Factory/fillup/fillup.changes 2012-02-14 11:23:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fillup.new/fillup.changes 2014-11-07 14:07:15.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Nov 3 13:09:25 UTC 2014 - [email protected] + +- Also return back the /bin/fillup provides line + +------------------------------------------------------------------- +Fri Oct 31 12:02:57 UTC 2014 - [email protected] + +- 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 - [email protected] + +- Cleanup the mess in spec with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fillup.spec ++++++ --- /var/tmp/diff_new_pack.8SGpVI/_old 2014-11-07 14:07:16.000000000 +0100 +++ /var/tmp/diff_new_pack.8SGpVI/_new 2014-11-07 14:07:16.000000000 +0100 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,21 @@ Name: fillup -Provides: aaa_base:/bin/fillup Version: 1.42 Release: 0 Summary: Tool for Merging Config Files License: GPL-2.0+ Group: System/Base +Url: http://github.com/openSUSE/fillup Source: fillup-%{version}.tar.bz2 -Patch: fillup-optflags.patch +Patch0: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif Patch4: fillup-nodate.patch Patch5: fillup-1.42-cloexec.patch +Provides: aaa_base:/bin/fillup BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. %description fillup merges files that hold variables. A variable is defined by an @@ -41,54 +41,36 @@ %prep %setup -q -%patch +%patch0 %patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 +%patch2 +%patch3 +%patch4 %patch5 %build -# -# 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" +make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" %install -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -# -# install fillup -# -install -d -m 755 $RPM_BUILD_ROOT/%{_bindir} -install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir} -#UsrMerge +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -d -m 755 %{buildroot}/%{_bindir} +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) +# 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 -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 %defattr(-,root,root) -#UsrMerge +# rpm scriptlets still use this, based on %*fillup* macros /bin/fillup -#EndUserMerge %{_bindir}/fillup %{_mandir}/man8/fillup* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
