diff --git a/inkscape-automake111.patch b/inkscape-automake111.patch new file mode 100644 index 0000000..ea65e5a --- /dev/null +++ b/inkscape-automake111.patch @@ -0,0 +1,12 @@ +Index: inkscape-0.46/share/templates/Makefile.am +=================================================================== +--- inkscape-0.46.orig/share/templates/Makefile.am ++++ inkscape-0.46/share/templates/Makefile.am +@@ -15,7 +15,6 @@ templates_DATA = \ + DVD_cover_slim_300dpi.svg \ + DVD_cover_superslim_300dpi.svg \ + DVD_cover_ultraslim_300dpi.svg \ +- default.svg \ + default.ca.svg \ + default.cs.svg \ + default.de.svg \ diff --git a/inkscape.changes b/inkscape.changes index 351996e..fec4321 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 13 11:58:53 CEST 2009 - coolo@novell.com + +- remove dupliacted files (fix build with automake 1.11) + ------------------------------------------------------------------- Wed May 13 02:53:30 CEST 2009 - vuntz@novell.com diff --git a/inkscape.spec b/inkscape.spec index 450e985..cc15113 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -20,12 +20,12 @@ Name: inkscape BuildRequires: boost-devel docbook-toys fdupes gc-devel gcc-c++ gnome-vfs2-devel gtkmm24-devel intltool libMagick++-devel liblcms-devel libpoppler-glib-devel libwpg-devel libxslt-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Group: Productivity/Graphics/Vector Editors Requires: ghostscript-fonts-std python-gtk pstoedit gzip /usr/bin/gs Summary: Inkscape Vector Illustration Program Version: 0.46 -Release: 67 +Release: 68 # package in <= NLD9 and SuSE Linux <= 9.1 Provides: sodipodi Obsoletes: sodipodi @@ -45,6 +45,8 @@ Patch17: inkscape-lp237574-poppler.patch Patch18: inkscape-remove-datetime.patch # PATCH-FIX-UPSTREAM inkscape-gcc44.patch vuntz@novell.com -- Taken from svn Patch19: inkscape-gcc44.patch +# PATCH-FIX-UPSTREAM inkscape-automake111.patch coolo@novell.com -- fix duplicated files +Patch20: inkscape-automake111.patch Url: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -101,7 +103,7 @@ Authors: Masatake Yamato %package extensions-extra -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Summary: Inkscape Vector Illustration Program - Extra Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} python-lxml pyxml @@ -167,7 +169,7 @@ Authors: Masatake Yamato %package extensions-dia -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Summary: Inkscape Vector Illustration Program - Dia Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} dia @@ -229,7 +231,7 @@ Authors: Masatake Yamato %package extensions-fig -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Summary: Inkscape Vector Illustration Program - Fig Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} transfig @@ -292,7 +294,7 @@ Authors: Masatake Yamato %package extensions-gimp -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Summary: Inkscape Vector Illustration Program - The GIMP Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} gimp-2.0 @@ -355,7 +357,7 @@ Authors: Masatake Yamato %package extensions-skencil -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Summary: Inkscape Vector Illustration Program - Skencil Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} skencil @@ -426,6 +428,7 @@ Authors: %patch17 -p1 %patch18 -p1 %patch19 -p0 +%patch20 -p1 patch < element, ICC color profiles for images -- Persistent rotation centers, Paste Size command -- many bug fixes -- removed the --with-perl option from configuration in the specfile -* Sat Sep 09 2006 meissner@suse.de -- use RPM_OPT_FLAGS. -* Wed Aug 16 2006 cthiel@suse.de -- buildrequire python-gtk-devel instead of python-gtk -* Fri Jul 07 2006 jpr@suse.de -- add patch to not use freetype2 internals -* Sat Feb 18 2006 stbinner@suse.de -- fix typo .desktop file -* Sat Feb 18 2006 gekker@suse.de -- fixup .desktop file for UI team -* Tue Jan 31 2006 ro@suse.de -- take fix from swig to swig-generated source file -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Nov 23 2005 sbrabec@suse.cz -- Updated to version 0.43 (#134655). -- Enabled Inkboard Collaborative Editing. -* Mon Nov 07 2005 sbrabec@suse.cz -- Fixed qualification and type conversion errors. -* Thu Aug 25 2005 nadvornik@suse.cz -- updated to bugfix release 0.42.2 [#112918] -* Mon Aug 01 2005 ro@suse.de -- added dir to filelist /usr/share/man/fr/man1 -* Fri Jul 29 2005 sbrabec@suse.cz -- Updated to version 0.42. -* Tue May 31 2005 schwab@suse.de -- Fix more invalid casts. -* Wed May 18 2005 ro@suse.de -- fix build with current pkgconfig -* Thu Apr 28 2005 sbrabec@suse.cz -- Build boehm-gc with -fPIC and -fno-strict-aliasing. -* Wed Apr 27 2005 ro@suse.de -- remove boehm-gc from nfb (dropped) -- use private copy of gc6.4 -* Tue Apr 26 2005 sbrabec@suse.cz -- Install missing translation files. -* Mon Apr 11 2005 sbrabec@suse.cz -- Fixed invalid casts. -* Mon Mar 21 2005 sbrabec@suse.cz -- Bi-arch fix (#66780). -- Require skencil needed for PS/EPS input (#66780). -* Mon Feb 28 2005 sbrabec@suse.cz -- Added needed Requires and triggers for optional extensions - (#66780). -- Turned on perl, python and gnome-print support. -* Mon Feb 21 2005 sbrabec@suse.cz -- Updated to version 0.41. -- Worked around problems with boehm-gc detection. -* Fri Feb 11 2005 sbrabec@suse.cz -- Updated to version 0.40. -* Fri Feb 11 2005 ro@suse.de -- change to libsigc++12 in neededforbuild -* Tue Nov 02 2004 mmj@suse.de -- Locale rename: no -> nb -* Thu Aug 12 2004 hhetter@suse.de -- Obsolete and Provide sodipodi -* Mon Aug 02 2004 hhetter@suse.de -- initial SuSE package