From: Szymon Siwek <sls@pld-linux.org>
Date: Fri, 5 Feb 2010 16:22:06 +0000 (+0000)
Subject: - added libpngX.patch
X-Git-Tag: auto/th/abiword-2_8_1-4~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fabiword.git;a=commitdiff_plain;h=0cf209bf5c6f94f7a15a2b769f52ab132be83113

- added libpngX.patch

Changed files:
    abiword.spec -> 1.182
    libpngX.patch -> 1.1
---

diff --git a/abiword.spec b/abiword.spec
index dbe4d29..646b265 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -22,6 +22,7 @@ Group:		X11/Applications/Editors
 Source0:	http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz
 # Source0-md5:	284fe25289c160c3797b527a8aacad12
 Patch0:		%{name}-desktop.patch
+Patch1:		libpngX.patch
 URL:		http://www.abisource.com/
 BuildRequires:	aiksaurus-gtk-devel >= 1.2.1
 BuildRequires:	aspell-devel >= 0.60.4
@@ -309,6 +310,7 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' Makefile.am
diff --git a/libpngX.patch b/libpngX.patch
new file mode 100644
index 0000000..c4799fb
--- /dev/null
+++ b/libpngX.patch
@@ -0,0 +1,33 @@
+--- abiword-2.8.1/plugins/garble/Makefile.am.orig	2009-10-20 17:07:49.000000000 +0200
++++ abiword-2.8.1/plugins/garble/Makefile.am	2010-02-05 17:05:16.644285818 +0100
+@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = garble.la
+ 
+ garble_la_LIBADD = \
+ 	xp/libxp.la \
+-	$(GARBLE_LIBS) -lpng12 -ljpeg
++	$(GARBLE_LIBS) -lpng -ljpeg
+ 
+ garble_la_LDFLAGS = \
+ 	$(GARBLE_LIBS) \
+--- abiword-2.8.1/plugins/rsvg/Makefile.am.orig	2009-10-20 17:07:49.000000000 +0200
++++ abiword-2.8.1/plugins/rsvg/Makefile.am	2010-02-05 17:05:16.870953670 +0100
+@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = rsvg.la
+ 
+ rsvg_la_LIBADD = \
+ 	xp/libxp.la \
+-	$(RSVG_LIBS) -lpng12
++	$(RSVG_LIBS) -lpng
+ 
+ rsvg_la_LDFLAGS = \
+ 	-avoid-version \
+--- abiword-2.8.1/plugin-configure.m4.orig	2010-02-05 17:05:54.863451295 +0100
++++ abiword-2.8.1/plugin-configure.m4	2010-02-05 17:06:05.057616795 +0100
+@@ -1553,7 +1553,7 @@ if test "$enable_bmp" == "yes" || \
+ # TODO check for libpng, well abiword links to it anyways
+ 
+ BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}'
+-BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12'
++BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng'
+ 
+ if test "$enable_bmp_builtin" == "yes"; then
+ 	BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"