rpms/mtpaint/devel mtpaint-3.31-dso.patch, NONE, 1.1 mtpaint.spec, 1.7, 1.8

[terjeros]

Author: terjeros

Update of /cvs/pkgs/rpms/mtpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10670

Modified Files:
	mtpaint.spec 
Added Files:
	mtpaint-3.31-dso.patch 
Log Message:
* Thu Feb 11 2010 Terje Rosten <terje.rosten at ntnu.no> - 3.31-4
- Add DSO patch


mtpaint-3.31-dso.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mtpaint-3.31-dso.patch ---
Bdiff -up mtpaint-3.31/configure~ mtpaint-3.31/configure
--- mtpaint-3.31/configure~	2009-04-15 20:46:26.000000000 +0200
+++ mtpaint-3.31/configure	2010-02-11 21:16:43.996238223 +0100
@@ -460,7 +460,7 @@ else
 			fi
 		else
 			GTK_INCLUDE=`pkg-config gtk+-2.0 --cflags`
-			GTK_LIB=`pkg-config gtk+-2.0 --libs`
+			GTK_LIB="`pkg-config gtk+-2.0 --libs` -lX11 -lm"
 		fi
 	else
 		BIN_INSTALL=$WIN_BIN_INSTALL


Index: mtpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/mtpaint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mtpaint.spec	19 Aug 2009 22:02:02 -0000	1.7
+++ mtpaint.spec	11 Feb 2010 20:20:53 -0000	1.8
@@ -3,14 +3,15 @@
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
 Version:       3.31
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
 URL:           http://mtpaint.sourceforge.net/
-Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:       http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:       http://downloads.sf.net/%{name}/%{name}_handbook-%{docver}.zip
-Patch:         %{name}-3.19-xdg-open.patch
+Patch0:        %{name}-3.19-xdg-open.patch
 Patch1:        %{name}-3.19-openjpeg.patch
+Patch2:        %{name}-3.31-dso.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel zlib-devel
 BuildRequires: libpng-devel giflib-devel libjpeg-devel libtiff-devel
@@ -36,8 +37,9 @@ application mtpaint.
 
 %prep
 %setup -q -a 1
-%patch -p1
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # We have moved docs
 %{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
@@ -100,7 +102,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
-* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-1
+* Thu Feb 11 2010 Terje Rosten <terje.rosten at ntnu.no> - 3.31-4
+- Add DSO patch
+
+* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-3
 - Update to 3.31
 - Make handbook package noarch
 - New gtk-update-icon-cache scriptlets