dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-inkscape-0.44.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+inkscape-0.45.1.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: inkscape
-# $Id$
-NAME := inkscape
-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)

inkscape-0.44.1-psinput.patch

@@ -0,0 +1,42 @@
+--- inkscape-0.44.1/share/extensions/ps_input.inx.orig	2006-12-06 11:47:27.000000000 +0100
++++ inkscape-0.44.1/share/extensions/ps_input.inx	2006-12-06 11:46:40.000000000 +0100
+@@ -1,7 +1,6 @@
+ <inkscape-extension>
+     <_name>Postscript Input</_name>
+     <id>org.inkscape.input.ps</id>
+-    <dependency type="extension">org.inkscape.input.sk</dependency>
+     <dependency type="executable">pstoedit</dependency>
+     <input>
+         <extension>.ps</extension>
+@@ -11,7 +10,6 @@
+         <output_extension>org.inkscape.output.ps</output_extension>
+     </input>
+     <script>
+-        <command reldir="path">pstoedit -f sk</command>
+-        <helper_extension>org.inkscape.input.sk</helper_extension>
++        <command reldir="path">pstoedit -ndt -f plot-svg</command>
+     </script>
+ </inkscape-extension>
+--- inkscape-0.44.1/share/extensions/eps_input.inx.orig	2006-12-06 12:19:56.000000000 +0100
++++ inkscape-0.44.1/share/extensions/eps_input.inx	2006-12-06 12:19:42.000000000 +0100
+@@ -1,9 +1,8 @@
+ <inkscape-extension>
+     <_name>EPS Input</_name>
+     <id>org.inkscape.input.eps</id>
+-    <dependency type="extension">org.inkscape.input.ps</dependency>
+-    <dependency type="executable">gs</dependency>
+-    <input>
++    <dependency type="executable">pstoedit</dependency>
++     <input>
+         <extension>.eps</extension>
+         <mimetype>image/x-encapsulated-postscript</mimetype>
+         <_filetypename>Encapsulated Postscript (*.eps)</_filetypename>
+@@ -11,7 +10,6 @@
+         <output_extension>org.inkscape.output.eps</output_extension>
+     </input>
+     <script>
+-        <command reldir="path">gs -q -sDEVICE=pswrite -sOutputFile=- -dNOPAUSE -dBATCH -dSAFER -dDEVICEWIDTH=250000 -dDEVICEHEIGHT=250000</command>
+-        <helper_extension>org.inkscape.input.ps</helper_extension>
++         <command reldir="path">pstoedit -ndt -f plot-svg</command>
+     </script>
+ </inkscape-extension>

inkscape-0.45-python.patch

@@ -0,0 +1,11 @@
+--- inkscape-0.45/configure.orig	2007-02-07 12:08:44.000000000 -0800
++++ inkscape-0.45/configure	2007-02-07 12:22:34.000000000 -0800
+@@ -10769,7 +10769,7 @@
+     if test "$?" -gt "0"; then
+         with_python="no"
+     else
+-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('DBLIB'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+         if test "$?" -gt "0"; then
+             with_python="no"
+         else

inkscape.spec

@@ -1,5 +1,7 @@
+%define _with_inkboard 1
+
 Name:           inkscape
-Version:        0.44.1
+Version:        0.45.1
 Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
@@ -7,6 +9,8 @@ Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz
+Patch0:         inkscape-0.44.1-psinput.patch
+Patch1:         inkscape-0.45-python.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -16,30 +20,27 @@ BuildRequires:  gc-devel >= 6.4
 BuildRequires:  gettext
 BuildRequires:  gtkmm24-devel
 BuildRequires:  gtkspell-devel
-BuildRequires:  libart_lgpl-devel >= 2.3.10
-BuildRequires:  libgnomeprintui22-devel >= 2.2.0
 BuildRequires:  gnome-vfs2-devel >= 2.0
 BuildRequires:  libpng-devel >= 1.2
-BuildRequires:  libsigc++20-devel
-BuildRequires:  libxml2-devel >= 2.4.24
-BuildRequires:  libxslt-devel
+BuildRequires:  libsigc++20-devel >= 2.0.12
+BuildRequires:  libxml2-devel >= 2.6.11
+BuildRequires:  libxslt-devel >= 1.0.15
 BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
-BuildRequires:	lcms-devel >= 1.13
-BuildRequires:  boost-devel >= 1.33.1
-%{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno}
-%{?_with_python: BuildRequires:  python-devel}
-%{?_with_inkboard: BuildRequires:	loudmouth-devel >= 1.0}
-%{?_with_gnomeprint: BuildRequires:	libgnomeprint22-devel >= 2.2.0}
+BuildRequires:  lcms-devel >= 1.13
+BuildRequires:  cairo-devel
+BuildRequires:  openssl-devel
+BuildRequires:  dos2unix
+BuildRequires:  perl-XML-Parser
+BuildRequires:  python-devel
+%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0}
 
-Requires:	pstoedit
+Requires:       pstoedit
+Requires:       perl(Image::Magick)
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
-Provides:       perl(SpSVG)
-Provides:       perl(SVG)
-
 
 %description
 Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
@@ -57,6 +58,11 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 
 %prep
 %setup -q
+%patch0 -p1 -b .psinput
+%patch1 -p1 -b .python
+find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
+find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
+dos2unix share/extensions/*.py
 
 
 %build
@@ -64,20 +70,11 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 --disable-dependency-tracking  \
 --with-xinerama                \
 --enable-static=no             \
-%if "%{?_with_python}"
 --with-python                  \
-%endif
-%if "%{?_with_perl}"
 --with-perl                    \
-%endif
 --with-gnome-vfs               \
 --with-inkjar                  \
-%if "%{?_with_inkboard}"
 --enable-inkboard              \
-%endif
-%if "%{?_with_gnomeprint}"
---with-gnome-print             \
-%endif
 --enable-lcms
 
 make %{?_smp_mflags}
@@ -89,6 +86,9 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.*
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
+
 desktop-file-install --vendor fedora --delete-original     \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
   --add-category X-Fedora                                  \
@@ -119,6 +119,21 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Tue Mar 20 2007 Denis Leroy <denis@poolshark.org> - 0.45.1-1
+- Update to bugfix release 0.45.1
+- Added R to ImageMagick-perl (#231563)
+
+* Wed Feb  7 2007 Denis Leroy <denis@poolshark.org> - 0.45-1
+- Update to 0.45
+- Enabled inkboard, perl and python extensions
+- Added patch for correct python autodetection
+- LaTex patch integrated upstreamed, removed
+- Some rpmlint cleanups
+
+* Fri Dec  1 2006 Denis Leroy <denis@poolshark.org> - 0.44.1-2
+- Added patches to fix LaTex import (#217699)
+- Added patch to base postscript import on pstoedit plot-svg
+
 * Thu Sep  7 2006 Denis Leroy <denis@poolshark.org> - 0.44.1-1
 - Update to 0.44.1
 - Removed png export patch, integrated upstream

sources

@@ -1 +1 @@
-ae2929f70403004038963ef2448728f3  inkscape-0.44.1.tar.gz
+1ac63dfd5d78a676599bf5cf6d22e493  inkscape-0.45.1.tar.gz