From 5108ce71150033b71e0235b6548dfc9c8345ca134e1bcb5c07df4824c27b4d3f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 26 Aug 2009 15:24:50 +0000 Subject: [PATCH] Accepting request 18868 from Base:System Copy from Base:System/fillup based on submit request 18868 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18868 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillup?expand=0&rev=4 --- fillup.changes | 5 ++++ fillup.spec | 65 +++----------------------------------------------- 2 files changed, 8 insertions(+), 62 deletions(-) diff --git a/fillup.changes b/fillup.changes index f4c998a..a9c1da5 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + ------------------------------------------------------------------- Tue Sep 19 14:40:35 CEST 2006 - rguenther@suse.de diff --git a/fillup.spec b/fillup.spec index 3a43f20..36a8da8 100644 --- a/fillup.spec +++ b/fillup.spec @@ -1,7 +1,7 @@ # # spec file for package fillup (Version 1.42) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -24,7 +24,7 @@ Group: System/Base Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 242 +Release: 243 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch @@ -48,7 +48,7 @@ Authors: %prep %setup -q -%patch0 -p1 +%patch -p1 %patch1 -p1 %patch2 -p0 %patch3 -p0 @@ -86,62 +86,3 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/fillup* %changelog -* Tue Sep 19 2006 rguenther@suse.de -- Do not install info or plaintext documentation (same as manpage). -- Remove sgmltool BuildRequires. -* Mon May 22 2006 schwab@suse.de -- Don't strip binaries. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jan 11 2006 ro@suse.de -- fix missing return value in test-code (#139594) -* Fri Sep 02 2005 werner@suse.de -- Fix segv on big endian (bug #114066) - * Correct usage of EOF macro, this is and was never a character - * Make it handle missing newline at EOF -- Make it strict alias safe -- Compare the correct debug output in test suite (bug #95371) -* Wed Jul 27 2005 ro@suse.de -- silence some compiler warnings (#95370) -* Tue Jun 28 2005 ro@suse.de -- removed -fsigned-char (#93875) -* Wed Jun 15 2005 meissner@suse.de -- Use RPM_OPT_FLAGS -fno-strict-aliasing. -- compile OPTIMIZE, drop some no longer applying -f flags. -* Mon Mar 01 2004 ro@suse.de -- fix install_info stuff in postun -* Mon Oct 20 2003 ro@suse.de -- use defattr -- don't build as root -* Thu Sep 11 2003 ro@suse.de -- update to 1.42 (#30279) -* Mon Aug 25 2003 ro@suse.de -- update to 1.41 -- additional Keyword: PreSaveCommand -* Thu Aug 14 2003 ro@suse.de -- update to 1.38 with additional MetaData keywords -* Mon Jun 16 2003 kukuk@suse.de -- Remove /var/adm/fillup-templates, already in filesystem package -* Wed Mar 12 2003 ro@suse.de -- update to 1.24 including the last two patches and - more testcases for "make check" -* Wed Mar 12 2003 ro@suse.de -- switch behaviour to "fixed sequence of metadata" (#25119) -* Sun Mar 09 2003 ro@suse.de -- fix watchdog for removal part (factor 2 needed) - (fix for reopened #24648) -* Thu Mar 06 2003 ro@suse.de -- update to 1.22 (avoid possible infinite loop on failure) (#24648) -* Thu Mar 06 2003 ro@suse.de -- fix for stale comment when removing variable (#24540) -* Wed Feb 19 2003 ro@suse.de -- update to 1.21 -- works around problem with comments wrongly typed as metadata -* Thu Feb 06 2003 ro@suse.de -- added install-info macros -* Thu Nov 28 2002 ro@suse.de -- update to 1.20 beta (aka prototype) -* Mon Nov 11 2002 ro@suse.de -- changed neededforbuild to -* Mon Aug 12 2002 ro@suse.de -- split off aaa_base