Hello community, here is the log from the commit of package lifelines for openSUSE:Factory checked in at 2014-02-26 06:58:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lifelines (Old) and /work/SRC/openSUSE:Factory/.lifelines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lifelines" Changes: -------- --- /work/SRC/openSUSE:Factory/lifelines/lifelines.changes 2013-05-16 16:13:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lifelines.new/lifelines.changes 2014-02-26 06:58:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 24 10:29:29 UTC 2014 - [email protected] + +- lifelines-decl.patch: fix conflicting declaration + +------------------------------------------------------------------- New: ---- lifelines-decl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lifelines.spec ++++++ --- /var/tmp/diff_new_pack.ULCmXE/_old 2014-02-26 06:58:38.000000000 +0100 +++ /var/tmp/diff_new_pack.ULCmXE/_new 2014-02-26 06:58:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lifelines # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -54,6 +54,8 @@ Patch1: lifelines-3.0.59-funcptr.dif # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: lifelines-3.0.60-array.dif +# PATCH-FIX-UPSTREAM Fix conflicting declaration +Patch3: lifelines-decl.patch BuildRequires: tidy BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -69,6 +71,7 @@ %patch0 -p 0 %patch1 -p 0 %patch2 -p 0 +%patch3 -p1 %build CFLAGS="%{optflags} -fno-strict-aliasing -pipe $(%{ncursesw_config} --cflags)" ++++++ lifelines-decl.patch ++++++ Index: lifelines-3.0.62/src/gedlib/init.c =================================================================== --- lifelines-3.0.62.orig/src/gedlib/init.c +++ lifelines-3.0.62/src/gedlib/init.c @@ -65,7 +65,7 @@ STRING editfile=NULL; /* file used for e extern BOOLEAN writeable; extern STRING readpath,readpath_file; extern STRING illegal_char; -extern INT opt_finnish, opt_mychar; +extern BOOLEAN opt_finnish, opt_mychar; /********************************************* * local function prototypes -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
