Accepting request 27548 from Base:System

Copy from Base:System/fillup based on submit request 27548 from user coolo

OBS-URL: https://build.opensuse.org/request/show/27548
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillup?expand=0&rev=7
This commit is contained in:
OBS User autobuild 2009-12-26 11:19:29 +00:00 committed by Git OBS Bridge
commit d1f206c618
3 changed files with 31 additions and 1 deletions

23
fillup-nodate.patch Normal file
View File

@ -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( );

View File

@ -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

View File

@ -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
#