From 9cee2487f8537fada9e86b0e5064bd2594b480eb7ec2629ff93c7b46c8fb2430 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 2 Oct 2011 08:03:30 +0000 Subject: [PATCH] Accepting request 85554 from GNOME:Apps Pushing G:A OBS-URL: https://build.opensuse.org/request/show/85554 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-gap?expand=0&rev=16 --- gimp-gap-link-lm.patch | 19 +++++++++++++++++++ gimp-gap.changes | 5 +++++ gimp-gap.spec | 19 +++++-------------- 3 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 gimp-gap-link-lm.patch diff --git a/gimp-gap-link-lm.patch b/gimp-gap-link-lm.patch new file mode 100644 index 0000000..21250b6 --- /dev/null +++ b/gimp-gap-link-lm.patch @@ -0,0 +1,19 @@ +--- gap/Makefile.am 2009-06-04 22:38:03.000000000 +0200 ++++ gap/Makefile.am.fixed 2011-09-29 10:45:49.445173300 +0200 +@@ -394,14 +394,14 @@ + LDADD = $(GIMP_LIBS) + + +-gap_plugins_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) ++gap_plugins_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) -lm + gap_bluebox_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_filter_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_fmac_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_fmac_varying_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_frontends_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_decode_mplayer_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) +-gap_morph_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) ++gap_morph_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) -lm + gap_name2layer_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_navigator_dialog_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) + gap_player_LDADD = $(GAPVIDEOAPI) $(WAVPLAYCLIENT) ${LIBGAPSTORY} $(LIBGAPBASE) $(GIMP_LIBS) diff --git a/gimp-gap.changes b/gimp-gap.changes index a544a86..94801bd 100644 --- a/gimp-gap.changes +++ b/gimp-gap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 29 08:41:41 UTC 2011 - idonmez@suse.com + +- Add gimp-gap-link-lm.patch to fix linking with new ld. + ------------------------------------------------------------------- Wed Dec 22 15:48:24 CET 2010 - meissner@suse.de diff --git a/gimp-gap.spec b/gimp-gap.spec index c3d1de5..a24bfb5 100644 --- a/gimp-gap.spec +++ b/gimp-gap.spec @@ -1,7 +1,7 @@ # -# spec file for package gimp-gap (Version 2.6.0) +# spec file for package gimp-gap # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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: %{name}-no-strict-aliasing.patch Patch2: %{name}-warnings.patch # PATCH-FIX-UPSTREAM gimp-gap-warnings-orig-addon.patch bgo585343 sbrabec@suse.cz -- Fix of serious warnings. Patch3: %{name}-warnings-orig-addon.patch +# PATCH-FIX-UPSTREAM gimp-gap-link-lm.patch bgo#660443 idoenmez@suse.de -- Link to -lm where needed +Patch4: %{name}-link-lm.patch Source1: %{name}-patch-source.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?gimp_api_version:1}0 @@ -68,12 +70,6 @@ The GIMP-GAP (GIMP Animation Package) is a collection of Plug-Ins to extend the GIMP with capabilities to edit and create animations as sequences of single frames. - - -Authors: --------- - Wolfgang Hofer - %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} @@ -89,12 +85,6 @@ The GIMP-GAP (GIMP Animation Package) is a collection of Plug-Ins to extend the GIMP with capabilities to edit and create animations as sequences of single frames. - - -Authors: --------- - Wolfgang Hofer - %endif %endif %lang_package @@ -113,6 +103,7 @@ translation-update-upstream %if 0%{?BUILD_ORIG} %patch3 %endif +%patch4 sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS mv po/sr@Latn.po po/sr@latin.po