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

Accepting request 26350 from home:a_jaeger:branches:openSUSE:Factory

Browse Source 
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
This commit is contained in:
Stephan Kulow 2009-12-20 18:23:43 +00:00 committed by Git OBS Bridge
parent 5010b3d155
commit ffcc404799
3 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

10
fillup.changes
View File

@ -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 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de

14
fillup.spec
View File

@ -19,18 +19,19 @@
Name: fillup Name: fillup
License: GPL v2 or later License: GPLv2+
Group: System/Base Group: System/Base
Provides: aaa_base:/bin/fillup Provides: aaa_base:/bin/fillup
AutoReqProv: on AutoReqProv: on
Version: 1.42 Version: 1.42
Release: 243 Release: 244
Summary: Tool for Merging Config Files Summary: Tool for Merging Config Files
Source: fillup-%{version}.tar.bz2 Source: fillup-%{version}.tar.bz2
Patch: fillup-optflags.patch Patch: 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool.
@ -52,20 +53,21 @@ Authors:
%patch1 -p1 %patch1 -p1
%patch2 -p0 %patch2 -p0
%patch3 -p0 %patch3 -p0
%patch4 -p0
%build %build
# #
# Be sure that the tests for fillup are run in # Be sure that the tests for fillup are run in
# DEBUG mode for comparision with the references # DEBUG mode for comparision with the references
# #
make clean make %{?jobs:-j%jobs} clean
make test OPTISPLUS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs} test OPTISPLUS="$RPM_OPT_FLAGS"
# #
# For the real world make clean and use the # For the real world make clean and use the
# optimzed version. # optimzed version.
# #
make clean make %{?jobs:-j%jobs} clean
make compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS"
%install %install
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates