rpms/inkscape/devel inkscape-16571-cxxinclude.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 inkscape.spec, 1.41, 1.42 sources, 1.12, 1.13 inkscape-0.44.1-psinput.patch, 1.2, NONE inkscape-0.45-python.patch, 1.2, NONE inkscape-0.45.1-gtkprint.patch, 1.1, NONE inkscape-0.45.1-ill2svg.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Wed Feb 6 12:02:52 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13759/devel
Modified Files:
.cvsignore inkscape.spec sources
Added Files:
inkscape-16571-cxxinclude.patch
Removed Files:
inkscape-0.44.1-psinput.patch inkscape-0.45-python.patch
inkscape-0.45.1-gtkprint.patch inkscape-0.45.1-ill2svg.patch
Log Message:
0.46 prerelease
inkscape-16571-cxxinclude.patch:
--- NEW FILE inkscape-16571-cxxinclude.patch ---
--- inkscape-16571/src/Makefile.in.orig 2007-11-29 13:38:13.000000000 +0100
+++ inkscape-16571/src/Makefile.in 2007-11-29 13:38:29.000000000 +0100
@@ -317,7 +317,8 @@
$(POPPLER_GLIB_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
- -I$(top_srcdir)/cxxtest
+ -I$(top_srcdir)/cxxtest \
+ -I$(top_srcdir)/src/extension/script
@PLATFORM_WIN32_TRUE at win32_sources = winmain.cpp registrytool.cpp registrytool.h
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Mar 2007 09:29:43 -0000 1.12
+++ .cvsignore 6 Feb 2008 12:02:11 -0000 1.13
@@ -1 +1 @@
-inkscape-0.45.1.tar.gz
+inkscape-0.45.1+0.46pre1.tar.bz2
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- inkscape.spec 5 Dec 2007 14:32:15 -0000 1.41
+++ inkscape.spec 6 Feb 2008 12:02:12 -0000 1.42
@@ -1,18 +1,14 @@
-%define _with_inkboard 1
-
Name: inkscape
-Version: 0.45.1
-Release: 5%{?dist}
+Version: 0.45.1+0.46pre1
+Release: 1%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
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
-Patch2: inkscape-0.45.1-gtkprint.patch
-Patch3: inkscape-0.45.1-desktop.patch
+Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
+Patch0: inkscape-16571-cxxinclude.patch
+Patch1: inkscape-0.45.1-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: atk-devel
@@ -20,11 +16,10 @@
BuildRequires: freetype-devel
BuildRequires: gc-devel >= 6.4
BuildRequires: gettext
-BuildRequires: gtkmm24-devel
+BuildRequires: gtkmm24-devel >= 2.8.0
BuildRequires: gtkspell-devel
BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: libpng-devel >= 1.2
-BuildRequires: libsigc++20-devel >= 2.0.12
BuildRequires: libxml2-devel >= 2.6.11
BuildRequires: libxslt-devel >= 1.0.15
BuildRequires: pango-devel
@@ -35,19 +30,16 @@
BuildRequires: dos2unix
BuildRequires: perl-XML-Parser
BuildRequires: python-devel
-%if %{fedora} > 7
+BuildRequires: poppler-devel >= 0.5.9
BuildRequires: popt-devel
-%else
-BuildRequires: popt
-%endif
-# The following are needed due to gtkprint patch changing configure.ac
-BuildRequires: autoconf automake17 intltool
-%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0}
+BuildRequires: loudmouth-devel >= 1.0
+BuildRequires: boost-devel
Requires: pstoedit
Requires: perl(Image::Magick)
Requires: numpy
Requires: PyXML
+Requires: python-lxml
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -69,19 +61,14 @@
%prep
%setup -q
-%patch0 -p1 -b .psinput
-%patch1 -p1 -b .python
-%patch2 -p0 -b .gtkprint
-%patch3 -p1 -b .desktop
+%patch0 -p1 -b .cxxinclude
+%patch1 -p1 -b .desktop
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
-intltoolize --force
-autoconf
-autoheader
%configure \
--disable-dependency-tracking \
--with-xinerama \
@@ -91,14 +78,15 @@
--with-gnome-vfs \
--with-inkjar \
--enable-inkboard \
---enable-lcms
+--enable-lcms \
+--enable-poppler-cairo
make %{?_smp_mflags}
%install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -106,12 +94,12 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
desktop-file-install --vendor fedora --delete-original \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
%post
@@ -134,6 +122,16 @@
%changelog
+* Wed Feb 06 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-1
+- 0.46 prerelease
+- Minor cosmetic changes to satisfy the QA script
+- Dependency on Boost
+- Inkboard is not optional
+- Merge from Denis Leroy's svn16571 snapshot:
+- Require specific gtkmm24-devel versions
+- enable-poppler-cairo
+- No longer BuildRequire libsigc++20-devel
+
* Wed Dec 5 2007 Denis Leroy <denis at poolshark.org> - 0.45.1-5
- Rebuild with new openssl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Mar 2007 09:29:43 -0000 1.12
+++ sources 6 Feb 2008 12:02:12 -0000 1.13
@@ -1 +1 @@
-1ac63dfd5d78a676599bf5cf6d22e493 inkscape-0.45.1.tar.gz
+2b3b31cb92c558a68534f190d31b0d72 inkscape-0.45.1+0.46pre1.tar.bz2
--- inkscape-0.44.1-psinput.patch DELETED ---
--- inkscape-0.45-python.patch DELETED ---
--- inkscape-0.45.1-gtkprint.patch DELETED ---
--- inkscape-0.45.1-ill2svg.patch DELETED ---
More information about the fedora-extras-commits
mailing list