dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wxsvg-1.0b7_3.tar.gz

.gitignore

@@ -0,0 +1 @@
+wxsvg-1.0.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxsvg
-# $Id$
-NAME := wxsvg
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-ff34383d35221259312dc49127140c05  wxsvg-1.0b7_3.tar.gz
+baa08719193486b52041050f0a890ccc  wxsvg-1.0.tar.bz2

wxsvg-1.0-internal_expat.patch

@@ -0,0 +1,35 @@
+--- 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
+--- 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"

wxsvg.spec

@@ -1,22 +1,23 @@
-%define prever b7_3
-
-Summary: C++ library to create, manipulate and render SVG files
 Name: wxsvg
 Version: 1.0
-Release: 0.5.%{prever}%{?dist}
-License: wxWidgets
+Release: 4%{?dist}
+Summary: C++ library to create, manipulate and render SVG files
+
 Group: System Environment/Libraries
-URL: http://wxsvg.sourceforge.net/
-Source0: http://downloads.sf.net/wxsvg/wxsvg-%{version}%{prever}.tar.gz
-Source1: ltmain.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libart_lgpl-devel
-BuildRequires: pkgconfig
-BuildRequires: pango-devel
+License: wxWidgets
+URL: http://www.wxsvg.org/
+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, libtool
+BuildRequires: expat-devel
 BuildRequires: freetype-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: pango-devel
+BuildRequires: pkgconfig
 BuildRequires: wxGTK-devel
-# In 1.0b7_3 ltmain.sh is missing... so are Makefile.in files :-(
-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.
@@ -33,25 +34,33 @@ wxSVG is C++ library to create, manipulate and render SVG files.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{prever}
-%{__install} -m 0755 -p %{SOURCE1} ltmain.sh
-./autogen.sh
+%setup -q
+%patch0 -b .expat
+%{__rm} -rf src/svgxml/expat
 
 
 %build
-%configure --disable-static
-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
+./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}
 
 
 %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
@@ -68,12 +77,26 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/wxSVG/
-%{_includedir}/wxXML/
-%exclude %{_libdir}/*.la
+%{_includedir}/wxSVGXML/
 %{_libdir}/*.so
 
 
 %changelog
+* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-4
+- We do need the BR: libtool though...
+
+* 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
+
+* Thu Nov 20 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-1
+- Update to 1.0
+- Sync with devel branch
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.5.b7_3
 - Rebuild for new BuildID feature.