rpm/fillup
SHA256
1
0
Fork 0
forked from pool/fillup
Code Pull Requests Activity

- fillup-fno-common.patch: fix compilation on Tumbleweed

Browse Source 
(boo#1160871)

OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=26
This commit is contained in:
Adam Majer 2020-01-15 09:48:19 +00:00 committed by Git OBS Bridge
parent b5b981b79b
commit 6507a74fc2
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fillup-fno-common.patch Normal file
View File

@ -0,0 +1,17 @@
Index: fillup-1.42/SRC/fillup_cfg.h
===================================================================
--- fillup-1.42.orig/SRC/fillup_cfg.h
+++ fillup-1.42/SRC/fillup_cfg.h
@@ -23,9 +23,9 @@
/*-------------------------------- VARIABLES ---------------------------------*/
-const char * cfg_delimiter;
-const char * cfg_commentMarker;
-const char * cfg_quotingMarker;
+extern const char * cfg_delimiter;
+extern const char * cfg_commentMarker;
+extern const char * cfg_quotingMarker;
/*----------------------------------------------------------------------------*/

6
fillup.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 15 09:38:33 UTC 2020 - Adam Majer <adam.majer@suse.de>
- fillup-fno-common.patch: fix compilation on Tumbleweed
(boo#1160871)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com

8
fillup.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fillup # spec file for package fillup
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -25,7 +25,7 @@ Name: fillup
Version: 1.42 Version: 1.42
Release: 0 Release: 0
Summary: Tool for Merging Config Files Summary: Tool for Merging Config Files
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Base Group: System/Base
Url: http://github.com/openSUSE/fillup Url: http://github.com/openSUSE/fillup
Source: fillup-%{version}.tar.bz2 Source: fillup-%{version}.tar.bz2
@ -35,6 +35,7 @@ Patch2: fillup-%{version}.dif
Patch3: fillup-retval.dif Patch3: fillup-retval.dif
Patch4: fillup-nodate.patch Patch4: fillup-nodate.patch
Patch5: fillup-1.42-cloexec.patch Patch5: fillup-1.42-cloexec.patch
Patch6: fillup-fno-common.patch
Provides: aaa_base:/bin/fillup Provides: aaa_base:/bin/fillup
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -52,6 +53,7 @@ its variable name.
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 -p1
%build %build
make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}"