X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inkscape%2Fmingw32-inkscape.spec;h=dfdef2f94e13fa5fdbab46e308496c41bb26edc7;hb=f5fb0d87bb47b6a323131a45dea1e19c8718ce71;hp=4e97b84f7b9568d3a09d0c2e756ded98ee96f577;hpb=7929922693f380d4b7f5287c485b19b0a1ba09bb;p=fedora-mingw.git

diff --git a/inkscape/mingw32-inkscape.spec b/inkscape/mingw32-inkscape.spec
index 4e97b84..dfdef2f 100644
--- a/inkscape/mingw32-inkscape.spec
+++ b/inkscape/mingw32-inkscape.spec
@@ -7,38 +7,39 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
+%define svnrev 20568
+
 Name:           mingw32-inkscape
-Version:        20081027
-Release:        1%{?dist}
+Version:        0.47
+Release:        0.2.svn%{svnrev}%{?dist}
 Summary:        MinGW Windows port of Inkscape vector graphics editor
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.inkscape.org/
-# Checked out of SVN on the date shown and then just rolled up into
-# a tarball.
-# svn co https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk inkscape
-# tar zcf /tmp/inkscape-%{version}.tar.gz inkscape
-Source0:        inkscape-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Source patches needed.
-Patch0:         mingw32-inkscape-20081027-no-gc-version-check-when-crosscompiling.patch
-Patch1:         mingw32-inkscape-20081027-no-is-os-vista.patch
-Patch2:         mingw32-inkscape-20081027-extra-win32-objects.patch
-Patch3:         mingw32-inkscape-20081027-pango-enable-engine.patch
-Patch4:         mingw32-inkscape-20081027-no-setenv.patch
+Source0:        http://inkscape.modevia.com/svn-snap/inkscape-%{svnrev}.tar.bz2
+
+# Rolled-up source patch, submitted upstream on 2008-10-27.
+#Patch0:         mingw32-inkscape-20081027.patch
 
-# This is a hack, but for some reason PKG_CHECK_MODULES isn't
-# updating CFLAGS correctly.  This just works around the problem.
-Patch5:         mingw32-inkscape-20081027-Makefile.am-cflags.patch
+# Fix the paths.
+Patch1:         mingw32-inkscape-20081027-paths.patch
+
+# This patch is only needed to run under Wine, which doesn't
+# supported getting the outline of unhinted fonts.
+Patch2:         mingw32-inkscape-20081027-unhinted-fonts-for-wine.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 30
+BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-fontconfig
+BuildRequires:  mingw32-freetype
 BuildRequires:  mingw32-glibmm24
 BuildRequires:  mingw32-cairomm
 BuildRequires:  mingw32-pangomm
@@ -51,8 +52,10 @@ BuildRequires:  mingw32-gsl
 BuildRequires:  mingw32-boost
 BuildRequires:  mingw32-libsigc++20
 
-BuildRequires:  autoconf, automake, libtool
-BuildRequires:  perl
+BuildRequires:  autoconf, automake, libtool, intltool
+
+# For /usr/bin/glib-gettextize
+BuildRequires:  glib2-devel
 
 
 %description
@@ -69,36 +72,26 @@ community-oriented development.
 
 
 %prep
-%setup -q -n inkscape
-
-%patch0 -p0
+%setup -q -n inkscape-%{svnrev}
+#%patch0 -p0
 %patch1 -p0
 %patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
 
 ./autogen.sh
 
 
 %build
+PATH=%{_mingw32_bindir}:$PATH \
 %{_mingw32_configure} \
   --enable-lcms=no \
   --without-gnome-vfs
-
-# Additionally remove -lX* libraries from the Makefile.
-perl -pi.bak -e 's/-lX\w+//g' src/Makefile
-
-make
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Remove static libraries but DON'T remove *.dll.a files.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfoo.a
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,11 +99,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw32_bindir}/foo.dll
-%{_mingw32_libdir}/foo.dll.a
-# etc.
+%{_mingw32_bindir}/inkscape.exe
+%{_mingw32_bindir}/inkview.exe
+%{_mingw32_datadir}/applications/inkscape.desktop
+%{_mingw32_datadir}/inkscape/
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/inkscape.mo
+%{_mingw32_datadir}/pixmaps/inkscape.png
+%{_mingw32_mandir}/*/man1/*.1
+%{_mingw32_mandir}/man1/*.1
 
 
 %changelog
-* Wed Sep 24 2008 Your Name <you@example.com> - 1.2.3-1
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 0.47-0.2.svn20568
+- Rebuild for mingw32-gcc 4.4
+
+* Sun Jan 25 2009 Richard W.M. Jones <rjones@redhat.com> - 0.47-0.1.svn20568
 - Initial RPM release.