rpms/wxsvg/F-10 wxsvg-1.0-internal_expat.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wxsvg.spec, 1.8, 1.9

[Stewart Adam]

Author: firewing

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

Modified Files:
	.cvsignore sources wxsvg.spec 
Added Files:
	wxsvg-1.0-internal_expat.patch 
Log Message:
Update to 1.0 final


wxsvg-1.0-internal_expat.patch:

--- NEW FILE wxsvg-1.0-internal_expat.patch ---
--- src/svgxml/Makefile.am.orig	2008-11-13 21:33:02.000000000 -0500
+++ src/svgxml/Makefile.am	2008-11-13 21:36:12.000000000 -0500
@@ -1,7 +1,5 @@
-SUBDIRS = expat
-
 noinst_LTLIBRARIES = libwxsvgxml.la
 libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
-libwxsvgxml_la_LIBADD = expat/libexpat.la
+libwxsvgxml_la_LIBADD = $(EXPAT_LIBS)
 
 INCLUDES = -I$(top_builddir)/include/wxSVGXML


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxsvg/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Oct 2008 17:35:28 -0000	1.6
+++ .cvsignore	20 Nov 2008 16:09:19 -0000	1.7
@@ -1 +1 @@
-wxsvg-1.0b11.tar.bz2
+wxsvg-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxsvg/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2008 17:45:46 -0000	1.6
+++ sources	20 Nov 2008 16:09:19 -0000	1.7
@@ -1 +1 @@
-f885972a0535f0b47e3c7c913c4b1679  wxsvg-1.0b11.tar.bz2
+baa08719193486b52041050f0a890ccc  wxsvg-1.0.tar.bz2


Index: wxsvg.spec
===================================================================
RCS file: /cvs/extras/rpms/wxsvg/F-10/wxsvg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wxsvg.spec	17 Oct 2008 17:45:46 -0000	1.8
+++ wxsvg.spec	20 Nov 2008 16:09:19 -0000	1.9
@@ -1,19 +1,20 @@
-%define prever b11
-
-Summary: C++ library to create, manipulate and render SVG files
 Name: wxsvg
 Version: 1.0
-Release: 0.9.%{prever}%{?dist}
-License: wxWidgets
+Release: 1%{?dist}
+Summary: C++ library to create, manipulate and render SVG files
+
 Group: System Environment/Libraries
+License: wxWidgets
 URL: http://www.wxsvg.org/
-Source0: http://downloads.sf.net/wxsvg/wxsvg-%{version}%{prever}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+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: libart_lgpl-devel
 BuildRequires: pkgconfig
 BuildRequires: pango-devel
 BuildRequires: freetype-devel
 BuildRequires: wxGTK-devel
+BuildRequires: expat
 
 %description
 wxSVG is C++ library to create, manipulate and render SVG files.
@@ -30,26 +31,29 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{prever}
-
+%setup -q
+%patch0 -b .expat
 
 %build
 %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
+%{__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}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+
+# Get rid of those .la files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -60,8 +64,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
-%{_bindir}/calculette
-%{_bindir}/svgui
 %{_bindir}/svgview
 %{_libdir}/*.so.*
 
@@ -69,11 +71,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/wxSVG/
 %{_includedir}/wxSVGXML/
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 
 %changelog
+* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-1
+- Update to 1.0 final
+- Patch out the internal expat build
+
 * Fri Oct 17 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-0.9.b11
 - Update to 1.0b11