From 28d299d26115fa9ec553fe0e2206b4e753ff714cf3e5040acbcb7ce630202419 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Dec 2009 22:23:47 +0000 Subject: [PATCH 1/5] Accepting request 26334 from home:jengelh:branches:Base:System Copy from home:jengelh:branches:Base:System/fillup via accept of submit request 26334 revision 2. Request was accepted with message: reviewed OBS-URL: https://build.opensuse.org/request/show/26334 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=4 --- fillup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fillup.spec b/fillup.spec index 2bb8013..9a36c9b 100644 --- a/fillup.spec +++ b/fillup.spec @@ -19,12 +19,12 @@ Name: fillup -License: GPLv2+ +License: GPL v2 or later Group: System/Base Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 244 +Release: 243 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch From 5010b3d1557215ed4ea546ce3e2d54189fdd03cd8b9120c68904e8300d3750a1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 13:30:06 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=5 --- fillup.changes | 5 ----- fillup.spec | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fillup.changes b/fillup.changes index b0e329a..a9c1da5 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 13 01:25:18 CET 2009 - jengelh@medozas.de - -- enable parallel building - ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/fillup.spec b/fillup.spec index 9a36c9b..36a8da8 100644 --- a/fillup.spec +++ b/fillup.spec @@ -58,14 +58,14 @@ Authors: # Be sure that the tests for fillup are run in # DEBUG mode for comparision with the references # -make %{?jobs:-j%jobs} clean -make %{?jobs:-j%jobs} test OPTISPLUS="$RPM_OPT_FLAGS" +make clean +make test OPTISPLUS="$RPM_OPT_FLAGS" # # For the real world make clean and use the # optimzed version. # -make %{?jobs:-j%jobs} clean -make %{?jobs:-j%jobs} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" +make clean +make compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates From ffcc404799faf1d66694b65704a08526c954dc32d2a7e0d3bebbab8366109f39 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 20 Dec 2009 18:23:43 +0000 Subject: [PATCH 3/5] Accepting request 26350 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/fillup via accept of submit request 26350 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/26350 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=6 --- fillup-nodate.patch | 23 +++++++++++++++++++++++ fillup.changes | 10 ++++++++++ fillup.spec | 14 ++++++++------ 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 fillup-nodate.patch diff --git a/fillup-nodate.patch b/fillup-nodate.patch new file mode 100644 index 0000000..c642b88 --- /dev/null +++ b/fillup-nodate.patch @@ -0,0 +1,23 @@ +Index: SRC/services.c +=================================================================== +--- SRC/services.c.orig ++++ SRC/services.c +@@ -263,11 +263,15 @@ displayVersion + ) + { + static const char *versionString = +- "This is fillup, version %1.2f, compiled on %s\n\n"; ++ "This is fillup, version %1.2f\n\n"; + +- if( ( int )( strlen( versionString ) + strlen( __DATE__ ) - 3 ) != +- fprintf( stderr, versionString, VERSION, __DATE__ ) ) ++ if( ( int )( strlen( versionString ) - 1 ) != ++ fprintf( stderr, versionString, VERSION ) ) + { ++int res= fprintf( stderr, versionString, VERSION ); ++ ++fprintf (stderr,"strlen: %d, res: %d\n", strlen( versionString ), res); ++ + fillup_exception( __FILE__, __LINE__, ServiceException, + "displayVersion" ); + exitOnFailure( ); diff --git a/fillup.changes b/fillup.changes index a9c1da5..1d13b1a 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 13 01:25:18 CET 2009 - jengelh@medozas.de + +- enable parallel building + +------------------------------------------------------------------- +Sun Dec 13 13:17:06 UTC 2009 - aj@suse.de + +- Do not compile in date into binary to create reproduceable binaries. + ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/fillup.spec b/fillup.spec index 36a8da8..57ae64e 100644 --- a/fillup.spec +++ b/fillup.spec @@ -19,18 +19,19 @@ Name: fillup -License: GPL v2 or later +License: GPLv2+ Group: System/Base Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 243 +Release: 244 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif +Patch4: fillup-nodate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -52,20 +53,21 @@ Authors: %patch1 -p1 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build # # Be sure that the tests for fillup are run in # DEBUG mode for comparision with the references # -make clean -make test OPTISPLUS="$RPM_OPT_FLAGS" +make %{?jobs:-j%jobs} clean +make %{?jobs:-j%jobs} test OPTISPLUS="$RPM_OPT_FLAGS" # # For the real world make clean and use the # optimzed version. # -make clean -make compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" +make %{?jobs:-j%jobs} clean +make %{?jobs:-j%jobs} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates From 4c6f5a7b886511e1c642335e115564aa4bb5c3ef51649fda0d3cbb860affa96d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 11:19:28 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=7 --- fillup-nodate.patch | 23 ----------------------- fillup.changes | 5 ----- fillup.spec | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 fillup-nodate.patch diff --git a/fillup-nodate.patch b/fillup-nodate.patch deleted file mode 100644 index c642b88..0000000 --- a/fillup-nodate.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: SRC/services.c -=================================================================== ---- SRC/services.c.orig -+++ SRC/services.c -@@ -263,11 +263,15 @@ displayVersion - ) - { - static const char *versionString = -- "This is fillup, version %1.2f, compiled on %s\n\n"; -+ "This is fillup, version %1.2f\n\n"; - -- if( ( int )( strlen( versionString ) + strlen( __DATE__ ) - 3 ) != -- fprintf( stderr, versionString, VERSION, __DATE__ ) ) -+ if( ( int )( strlen( versionString ) - 1 ) != -+ fprintf( stderr, versionString, VERSION ) ) - { -+int res= fprintf( stderr, versionString, VERSION ); -+ -+fprintf (stderr,"strlen: %d, res: %d\n", strlen( versionString ), res); -+ - fillup_exception( __FILE__, __LINE__, ServiceException, - "displayVersion" ); - exitOnFailure( ); diff --git a/fillup.changes b/fillup.changes index 1d13b1a..b0e329a 100644 --- a/fillup.changes +++ b/fillup.changes @@ -3,11 +3,6 @@ Sun Dec 13 01:25:18 CET 2009 - jengelh@medozas.de - enable parallel building -------------------------------------------------------------------- -Sun Dec 13 13:17:06 UTC 2009 - aj@suse.de - -- Do not compile in date into binary to create reproduceable binaries. - ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/fillup.spec b/fillup.spec index 57ae64e..2bb8013 100644 --- a/fillup.spec +++ b/fillup.spec @@ -31,7 +31,6 @@ Patch: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif -Patch4: fillup-nodate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -53,7 +52,6 @@ Authors: %patch1 -p1 %patch2 -p0 %patch3 -p0 -%patch4 -p0 %build # From cc78dd0b502b4e4b6ab5f726c3bd4089c714b649d03270204e6d120c7fe6a2be Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 26 Dec 2009 11:19:29 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/fillup revision 7.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=32f0ab70b84c787744a0efa30ecf4a72 --- fillup-nodate.patch | 23 +++++++++++++++++++++++ fillup.changes | 5 +++++ fillup.spec | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 fillup-nodate.patch diff --git a/fillup-nodate.patch b/fillup-nodate.patch new file mode 100644 index 0000000..c642b88 --- /dev/null +++ b/fillup-nodate.patch @@ -0,0 +1,23 @@ +Index: SRC/services.c +=================================================================== +--- SRC/services.c.orig ++++ SRC/services.c +@@ -263,11 +263,15 @@ displayVersion + ) + { + static const char *versionString = +- "This is fillup, version %1.2f, compiled on %s\n\n"; ++ "This is fillup, version %1.2f\n\n"; + +- if( ( int )( strlen( versionString ) + strlen( __DATE__ ) - 3 ) != +- fprintf( stderr, versionString, VERSION, __DATE__ ) ) ++ if( ( int )( strlen( versionString ) - 1 ) != ++ fprintf( stderr, versionString, VERSION ) ) + { ++int res= fprintf( stderr, versionString, VERSION ); ++ ++fprintf (stderr,"strlen: %d, res: %d\n", strlen( versionString ), res); ++ + fillup_exception( __FILE__, __LINE__, ServiceException, + "displayVersion" ); + exitOnFailure( ); diff --git a/fillup.changes b/fillup.changes index b0e329a..5acae16 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 13 13:17:06 UTC 2009 - aj@suse.de + +- Do not compile in date into binary to create reproduceable binaries. + ------------------------------------------------------------------- Sun Dec 13 01:25:18 CET 2009 - jengelh@medozas.de diff --git a/fillup.spec b/fillup.spec index 2bb8013..a6c816c 100644 --- a/fillup.spec +++ b/fillup.spec @@ -24,13 +24,14 @@ Group: System/Base Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 244 +Release: 245 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif +Patch4: fillup-nodate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -52,6 +53,7 @@ Authors: %patch1 -p1 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build #