rpms/wxsvg/F-10 wxsvg-1.0-internal_expat.patch, 1.1, 1.2 wxsvg.spec, 1.10, 1.11

[Stewart Adam]

Author: firewing

Update of /cvs/extras/rpms/wxsvg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8683/F-10

Modified Files:
	wxsvg-1.0-internal_expat.patch wxsvg.spec 
Log Message:
Upstream re-uploaded tarball inplace... :/

Patch out internal expat sources, fix BR, don't libtoolize


wxsvg-1.0-internal_expat.patch:

Index: wxsvg-1.0-internal_expat.patch
===================================================================
RCS file: /cvs/extras/rpms/wxsvg/F-10/wxsvg-1.0-internal_expat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxsvg-1.0-internal_expat.patch	20 Nov 2008 16:09:19 -0000	1.1
+++ wxsvg-1.0-internal_expat.patch	11 Dec 2008 19:32:50 -0000	1.2
@@ -9,3 +9,27 @@
 +libwxsvgxml_la_LIBADD = $(EXPAT_LIBS)
  
  INCLUDES = -I$(top_builddir)/include/wxSVGXML
+--- configure.in.orig	2008-12-11 13:35:19.000000000 -0500
++++ configure.in	2008-12-11 13:35:24.000000000 -0500
+@@ -179,7 +179,6 @@
+   include/wxSVGXML/Makefile
+   include/wxSVG/Makefile
+   src/svgxml/Makefile
+-  src/svgxml/expat/Makefile
+   src/Makefile
+   src/agg/Makefile
+   src/cairo/Makefile
+--- src/svgxml/svgxml.cpp.orig	2008-12-11 13:39:49.000000000 -0500
++++ src/svgxml/svgxml.cpp	2008-12-11 13:40:00.000000000 -0500
+@@ -21,11 +21,7 @@
+ 
+ #include "svgxml.h"
+ 
+-#ifdef SYSEXPAT
+ #include <expat.h>
+-#else
+-#include "expat/xmlparse.h"
+-#endif
+ 
+ #include "wx/wfstream.h"
+ #include "wx/datstrm.h"


Index: wxsvg.spec
===================================================================
RCS file: /cvs/extras/rpms/wxsvg/F-10/wxsvg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wxsvg.spec	20 Nov 2008 16:46:36 -0000	1.10
+++ wxsvg.spec	11 Dec 2008 19:32:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name: wxsvg
 Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: C++ library to create, manipulate and render SVG files
 
 Group: System Environment/Libraries
@@ -9,13 +9,15 @@
 Source0: http://downloads.sf.net/wxsvg/wxsvg-%{version}.tar.bz2
 Patch0: wxsvg-1.0-internal_expat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: automake, autoconf
+BuildRequires: expat-devel
+BuildRequires: freetype-devel
 BuildRequires: libart_lgpl-devel
-BuildRequires: pkgconfig
 BuildRequires: pango-devel
-BuildRequires: freetype-devel
+BuildRequires: pkgconfig
 BuildRequires: wxGTK-devel
-BuildRequires: expat
-BuildRequires: libtool, automake, autoconf
+# this doesn't get picked up for some reason.
+Requires:      expat
 
 %description
 wxSVG is C++ library to create, manipulate and render SVG files.
@@ -34,17 +36,18 @@
 %prep
 %setup -q
 %patch0 -b .expat
-libtoolize --force
-./autogen.sh
+%{__rm} -rf src/svgxml/expat
 
 
 %build
+./autogen.sh
 %configure \
     --disable-dependency-tracking \
     --disable-static \
     --disable-ffmpeg
 %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %{__make} %{?_smp_mflags}
 
 
@@ -79,6 +82,11 @@
 
 
 %changelog
+* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-3
+- Don't use 'libtoolize --force' anymore
+- Update expat patch, rm -rf internal expat sources
+- BR: expat should be BR: expat-devel
+
 * Thu Nov 20 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-2
 - Use autogen.sh to generate ./configure