Author: firewing Update of /cvs/free/rpms/wxsvg/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv7632/F-10 Modified Files: .cvsignore sources Added Files: wxsvg-1.0-ffmpeg.patch wxsvg-1.0-internal_expat.patch wxsvg.spec Log Message: Initial import wxsvg-1.0-ffmpeg.patch: --- NEW FILE wxsvg-1.0-ffmpeg.patch --- --- src/Makefile.am.orig 2008-11-13 17:30:57.000000000 -0500 +++ src/Makefile.am 2008-11-13 17:31:42.000000000 -0500 @@ -47,5 +47,8 @@ SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(FFMPEG_SRC) libwxsvg_la_LIBADD = svgxml/libwxsvgxml.la $(RENDER_LIB) $(TEXT_LIB) +libwxsvg_la_CFLAGS = $(LIBAVFORMAT_CFLAGS) +libwxsvg_la_LDFLAGS = $(LIBAVFORMAT_LDFLAGS) + INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/include/wxSVG 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 --- 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" --- NEW FILE wxsvg.spec --- Name: wxsvg Version: 1.0 Release: 6%{?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.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2 Patch0: wxsvg-1.0-internal_expat.patch Patch1: wxsvg-1.0-ffmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool, gettext BuildRequires: expat-devel BuildRequires: ffmpeg-devel BuildRequires: freetype-devel BuildRequires: libart_lgpl-devel BuildRequires: pango-devel BuildRequires: wxGTK-devel %description wxSVG is C++ library to create, manipulate and render SVG files. %package devel Summary: Development files for the wxSVG library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: wxGTK-devel %description devel wxSVG is C++ library to create, manipulate and render SVG files. This package provides the files required to develop programs that use wxsvg. %prep %setup -q -n wxsvg-%{version} %patch0 -b .expat %patch1 -b .avformat %{__rm} -rf src/svgxml/expat %build ./autogen.sh %configure \ --disable-dependency-tracking \ --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 %{__make} %{?_smp_mflags} %install %{__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 $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{_libdir}/*.so.* %{_bindir}/* %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/wxSVG/ %{_includedir}/wxSVGXML/ %changelog * Wed Jan 21 2009 Stewart Adam <s.adam at diffingo.com> - 1.0-6 - Add libtool and ffmpeg-devel BR - Package headers & binaries again * Tue Jan 20 2009 Stewart Adam <s.adam at diffingo.com> - 1.0-5 - Bump for correct upgrade path from Fedora * Tue Jan 20 2009 Stewart Adam <s.adam at diffingo.com> - 1.0-4 - Rename wxsvg-freeworld to wxsvg and remove soname patch - Update description * Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-3 - Change soname to wxsvg_freeworld - Update expat patch, rm -rf internal expat sources - BR: expat should be BR: expat-devel * Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-2 - Split off a devel package * Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-1 - Update to 1.0 final - Remove requires on /etc/ld.so.conf.d - Patch out the internal expat build - Remove requires on wxsvg - Own %%{_libdir}/wxsvg-freeworld * Fri Oct 17 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-0.11.b11 - Remove useless -devel subpackage * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-0.10.b11 - Remove binaries and include files; these are the same as the originals - Remove ffmpeg-devel requirement on -devel package - Get rid of %%configure hack (CFLAGS/CXXFLAGS) - Require wxsvg and wxsvg-devel so the proper binaries and headers are pulled in - Add patch to use LIBAVFORMAT_{CFLAGS,LDFLAGS} in Makefile.am * Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-0.9.b11 - Make devel package require ffmpeg-devel - Edit #include statements to append -freeworld - Add README.Fedora * Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.0-0.8.b11 - New package based from Fedora's spec - Update to 1.0b11, enable ffmpeg - Use ld.so.conf.d to override non-ffmpeg enabled libraries * Wed Mar 5 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.8.b10 - Update to 1.0b10. - Build with dependency tracking disabled. * Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 1.0-0.8.b7_3 - Downgrade to 1.0b7_3 since 1.0b8_1 requires ffmpeg and disabling it doesn't seem to work properly and it has never avtually been built. - Update URL field. * Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org&gt; - Autorebuild for GCC 4.3 * Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 1.0-0.6.b8_1 - Update to 1.0b8_1. - Replace shipping our own ltmain.sh with running libtoolize. - Disable new ffmpeg option (which is enabled by default). - Still needs work (doesn't compile!), since ffmpeg seems to be mandatory now. * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.5.b7_3 - Rebuild for new BuildID feature. * Sun Aug 5 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.4.b7_3 - Update License field. * Wed Jun 6 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.3.b7_3 - Update to 1.0b7_3. - Pass -p to install. - Remove no longer needed freetype patch, but... - ...include our own ltmain.sh because it's missing... - ...run ./autogen.sh since Makefile.in files are missing too. * Wed May 9 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.2.b7 - Remove rpath on 64bit. - Update sf.net download URL. - Add missing wxGTK-devel requirement to the devel package. * Fri Jan 19 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.1.b7 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/wxsvg/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jan 2009 16:51:26 -0000 1.1 +++ .cvsignore 22 Jan 2009 23:31:21 -0000 1.2 @@ -0,0 +1 @@ +wxsvg-1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/wxsvg/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jan 2009 16:51:26 -0000 1.1 +++ sources 22 Jan 2009 23:31:21 -0000 1.2 @@ -0,0 +1 @@ +baa08719193486b52041050f0a890ccc wxsvg-1.0.tar.bz2