rpms/inkscape/FC-6 inkscape-0.45-python.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 inkscape.spec, 1.34, 1.35 sources, 1.10, 1.11 inkscape-0.44.1-latex.patch, 1.1, NONE

Denis Leroy (denis) fedora-extras-commits at redhat.com
Thu Feb 8 18:48:53 UTC 2007


Author: denis

Update of /cvs/extras/rpms/inkscape/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.45-python.patch 
Removed Files:
	inkscape-0.44.1-latex.patch 
Log Message:
- Update to 0.45
- Enabled inkboard, perl and python extensions
- Added patch for correct python autodetection
- LaTex patch integrated upstreamed, removed
- Some rpmlint cleanups


inkscape-0.45-python.patch:

--- NEW FILE inkscape-0.45-python.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	7 Sep 2006 09:59:41 -0000	1.10
+++ .cvsignore	8 Feb 2007 18:48:21 -0000	1.11
@@ -1 +1 @@
-inkscape-0.44.1.tar.gz
+inkscape-0.45.tar.gz


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-6/inkscape.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- inkscape.spec	6 Dec 2006 11:39:32 -0000	1.34
+++ inkscape.spec	8 Feb 2007 18:48:21 -0000	1.35
@@ -1,14 +1,16 @@
+%define _with_inkboard 1
+
 Name:           inkscape
-Version:        0.44.1
-Release:        2%{?dist}
+Version:        0.45
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 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-latex.patch
-Patch1:         inkscape-0.44.1-psinput.patch
+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
@@ -18,30 +20,26 @@
 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(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
@@ -59,8 +57,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .latex
-%patch1 -p1 -b .psinput
+%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
@@ -68,20 +69,11 @@
 --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}
@@ -93,6 +85,9 @@
 %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                                  \
@@ -123,6 +118,13 @@
 
 
 %changelog
+* Wed Feb  7 2007 Denis Leroy <denis at 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 at poolshark.org> - 0.44.1-2
 - Added patches to fix LaTex import (#217699)
 - Added patch to base postscript import on pstoedit plot-svg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Sep 2006 09:59:41 -0000	1.10
+++ sources	8 Feb 2007 18:48:21 -0000	1.11
@@ -1 +1 @@
-ae2929f70403004038963ef2448728f3  inkscape-0.44.1.tar.gz
+82d7cff90a7de42460e65d289e0d4d33  inkscape-0.45.tar.gz


--- inkscape-0.44.1-latex.patch DELETED ---




More information about the fedora-extras-commits mailing list