rpms/inkscape/devel inkscape-0.47-x11.patch, NONE, 1.1 inkscape.spec, 1.101, 1.102

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.47-x11.patch 
Log Message:
* Thu Feb 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.47-7
- Fix build


inkscape-0.47-x11.patch:
 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE inkscape-0.47-x11.patch ---
diff -up inkscape-0.47/configure.ac.x11 inkscape-0.47/configure.ac
--- inkscape-0.47/configure.ac.x11	2010-02-18 19:14:43.000000000 +0100
+++ inkscape-0.47/configure.ac	2010-02-18 19:34:08.000000000 +0100
@@ -675,10 +675,9 @@ if test "x$cairo_pdf" = "xyes"; then
 fi
 
 dnl Shouldn't we test for libpng and libz?
+INKSCAPE_LIBS="-lpng -lz -lX11 -lxml2"
 if test "x$openmp_ok" = "xyes"; then
-	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
-else
-	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+	INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi
 
 AC_CHECK_HEADER(popt.h,


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- inkscape.spec	21 Jan 2010 13:47:59 -0000	1.101
+++ inkscape.spec	18 Feb 2010 19:10:08 -0000	1.102
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -13,6 +13,7 @@ Patch4:         inkscape-20090410svn-for
 Patch5:         inkscape-20090925svn-el5.patch
 Patch6:         inkscape-20091101svn-icon.patch
 Patch7:         inkscape-0.47-newpoppler.patch
+Patch8:         inkscape-0.47-x11.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -136,6 +137,7 @@ graphics in W3C standard Scalable Vector
 %patch5 -p1 -b .el5
 %patch6 -p0 -b .japierdole
 %patch7 -p1 -b .poppler
+%patch8 -p1 -b .x11
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -227,6 +229,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.47-7
+- Fix build
+
 * Wed Jan 20 2010 Stepan Kasal <skasal at redhat.com> - 0.47-6
 - ExcludeArch: s390 s390x