rpms/inkscape/devel inkscape-0.46+devel-uniconv.patch, 1.1, 1.2 inkscape-20090226svn-oldcairo.patch, NONE, 1.1 inkscape-20090227svn-automake.patch, NONE, 1.1 inkscape-20090227svn-gcc44.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 inkscape.spec, 1.63, 1.64 sources, 1.16, 1.17 inkscape-0.46-bitmap-fonts.patch, 1.1, NONE inkscape-0.46-colors.patch, 1.1, NONE inkscape-0.46-cxxinclude.patch, 1.1, NONE inkscape-0.46-desktop.patch, 1.1, NONE inkscape-0.46-fixlatex.patch, 1.1, NONE inkscape-0.46-gtk2.13.3.patch, 1.1, NONE inkscape-0.46-gtkopen.patch, 1.1, NONE inkscape-0.46-poppler-0.8.3.patch, 1.1, NONE inkscape-0.46-uniconv.patch, 1.1, NONE inkscape-0.46pre2-icons.patch, 1.2, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Mar 2 21:27:12 UTC 2009
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12339
Modified Files:
.cvsignore inkscape.spec sources
Added Files:
inkscape-0.46+devel-uniconv.patch
inkscape-20090226svn-oldcairo.patch
inkscape-20090227svn-automake.patch
inkscape-20090227svn-gcc44.patch
Removed Files:
inkscape-0.46-bitmap-fonts.patch inkscape-0.46-colors.patch
inkscape-0.46-cxxinclude.patch inkscape-0.46-desktop.patch
inkscape-0.46-fixlatex.patch inkscape-0.46-gtk2.13.3.patch
inkscape-0.46-gtkopen.patch inkscape-0.46-poppler-0.8.3.patch
inkscape-0.46-uniconv.patch inkscape-0.46pre2-icons.patch
Log Message:
Update to SVN snapshot with solemn intent of annoying users. And compile with GCC 4.4 as well
inkscape-0.46+devel-uniconv.patch:
Index: inkscape-0.46+devel-uniconv.patch
===================================================================
RCS file: inkscape-0.46+devel-uniconv.patch
diff -N inkscape-0.46+devel-uniconv.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ inkscape-0.46+devel-uniconv.patch 2 Mar 2009 21:27:11 -0000 1.2
@@ -0,0 +1,108 @@
+See https://bugs.launchpad.net/inkscape/+bug/226383
+https://bugzilla.redhat.com/show_bug.cgi?id=458845
+
+Lubomir Rintel <lkundrak at v3.sk>
+
+diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in
+--- inkscape/inkscape.desktop.in.uniconv 2009-01-06 11:38:13.000000000 +0100
++++ inkscape/inkscape.desktop.in 2009-01-06 11:38:39.000000000 +0100
+@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ Type=Application
+ Categories=Graphics;VectorGraphics;GTK;
+-MimeType=image/svg+xml;image/svg+xml-compressed;
++MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
+ Exec=inkscape %F
+ TryExec=inkscape
+ Terminal=false
+diff -up inkscape/share/extensions/ccx_input.inx.uniconv inkscape/share/extensions/ccx_input.inx
+--- inkscape/share/extensions/ccx_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100
++++ inkscape/share/extensions/ccx_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>Corel DRAW Compressed Exchange files input</_name>
+ <id>org.inkscape.input.ccx</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.ccx</extension>
+diff -up inkscape/share/extensions/cdr_input.inx.uniconv inkscape/share/extensions/cdr_input.inx
+diff -up inkscape/share/extensions/cdt_input.inx.uniconv inkscape/share/extensions/cdt_input.inx
+--- inkscape/share/extensions/cdt_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100
++++ inkscape/share/extensions/cdt_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>Corel DRAW templates input</_name>
+ <id>org.inkscape.input.cdt</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.cdt</extension>
+diff -up inkscape/share/extensions/cgm_input.inx.uniconv inkscape/share/extensions/cgm_input.inx
+--- inkscape/share/extensions/cgm_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100
++++ inkscape/share/extensions/cgm_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>Computer Graphics Metafile files input</_name>
+ <id>org.inkscape.input.cgm</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.cgm</extension>
+diff -up inkscape/share/extensions/cmx_input.inx.uniconv inkscape/share/extensions/cmx_input.inx
+--- inkscape/share/extensions/cmx_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100
++++ inkscape/share/extensions/cmx_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>Corel DRAW Presentation Exchange files input</_name>
+ <id>org.inkscape.input.cmx</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.cmx</extension>
+diff -up inkscape/share/extensions/sk1_input.inx.uniconv inkscape/share/extensions/sk1_input.inx
+--- inkscape/share/extensions/sk1_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100
++++ inkscape/share/extensions/sk1_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>sK1 vector graphics files input</_name>
+ <id>org.inkscape.input.sk1</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.sk1</extension>
+diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py
+--- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-01-05 14:23:28.000000000 +0100
++++ inkscape/share/extensions/uniconv-ext.py 2009-01-06 11:41:29.000000000 +0100
+@@ -28,14 +28,10 @@ from subprocess import Popen, PIPE
+ cmd = 'none'
+
+ try:
+- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
+- if p!=127 : cmd = 'uniconv'
+ p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
+ if p!=127 : cmd = 'uniconvertor'
+ except ImportError:
+ from popen2 import Popen3
+- p = Popen3('uniconv', True).wait()
+- if p!=32512 : cmd = 'uniconv'
+ p = Popen3('uniconvertor', True).wait()
+ if p!=32512 : cmd = 'uniconvertor'
+
+diff -up inkscape/share/extensions/wmf_input.inx.uniconv inkscape/share/extensions/wmf_input.inx
+--- inkscape/share/extensions/wmf_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100
++++ inkscape/share/extensions/wmf_input.inx 2009-01-06 11:37:02.000000000 +0100
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+ <_name>Windows Metafile Input</_name>
+ <id>org.inkscape.input.wmf</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+ <input>
+ <extension>.wmf</extension>
inkscape-20090226svn-oldcairo.patch:
--- NEW FILE inkscape-20090226svn-oldcairo.patch ---
Solves the compilation issue with older cairo (tested with EL-5's 1.2.8)
Lubomir Rintel <lkundrak at v3.sk>
Index: src/extension/internal/cairo-ps-out.cpp
===================================================================
--- src/extension/internal/cairo-ps-out.cpp (revision 20786)
+++ src/extension/internal/cairo-ps-out.cpp (working copy)
@@ -38,6 +38,11 @@
#include "io/sys.h"
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+# define CAIRO_PS_LEVEL_2 0
+# define CAIRO_PS_LEVEL_3 1
+#endif
+
namespace Inkscape {
namespace Extension {
namespace Internal {
inkscape-20090227svn-automake.patch:
--- NEW FILE inkscape-20090227svn-automake.patch ---
Be able to autogen with older automake, that doesn't correctly compile
assembly language source files.
Lubomir Rintel <lkundrak at v3.sk>
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 20789)
+++ src/Makefile.am (working copy)
@@ -282,3 +282,8 @@
distclean-local:
rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+ $(CCASCOMPILE) -c -o $@ $<
Index: autogen.sh
===================================================================
--- autogen.sh (revision 20789)
+++ autogen.sh (working copy)
@@ -15,7 +15,7 @@
FILE=inkscape.spec.in
AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
GLIB_REQUIRED_VERSION=2.0.0
INTLTOOL_REQUIRED_VERSION=0.17
@@ -86,9 +86,9 @@
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.10
- ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+ ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
elif (automake --version) < /dev/null > /dev/null 2>&1; then
# Leave unversioned automake for a last resort: it may be a version earlier
# than what we require.
@@ -98,7 +98,7 @@
ACLOCAL=aclocal
else
echo
- echo " You must have automake 1.10 or newer installed to compile $PROJECT."
+ echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
DIE=1
fi
if test x$AUTOMAKE != x; then
inkscape-20090227svn-gcc44.patch:
--- NEW FILE inkscape-20090227svn-gcc44.patch ---
One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
Lubomir Rintel <lkundrak at v3.sk>
diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100
+++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-03-02 17:05:57.000000000 +0100
@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
char *search = (char *) g_strndup(xlink, 30);
if (strstr(search, "base64") != (char*)NULL) {
// 7 = strlen("base64") + strlen(",")
- char* pureBase64 = strstr(xlink, "base64") + 7;
+ const char* pureBase64 = strstr(xlink, "base64") + 7;
Magick::Blob blob;
blob.base64(pureBase64);
image->read(blob);
diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
--- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000 +0100
+++ inkscape/src/libnr/nr-object.cpp 2009-03-02 17:06:58.000000000 +0100
@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
);
memset(object, 0xf0, c->isize);
- object->klass = c;
c->cpp_ctor(object);
+ object->klass = c;
nr_class_tree_object_invoke_init (c, object);
return object;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 25 Mar 2008 16:27:22 -0000 1.16
+++ .cvsignore 2 Mar 2009 21:27:10 -0000 1.17
@@ -1 +1 @@
-inkscape-0.46.tar.bz2
+inkscape.tar.lzma
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- inkscape.spec 25 Feb 2009 07:24:49 -0000 1.63
+++ inkscape.spec 2 Mar 2009 21:27:11 -0000 1.64
@@ -1,22 +1,28 @@
+# Preserve lot of debugging information for now. This effectively
+# disables FORTIFY_SOURCE, so it must be enabled before Gold
+%define optflags %(rpm --eval %%optflags |sed 's/-O2/-O0/')
+
Name: inkscape
-Version: 0.46
-Release: 11%{?dist}
+Version: 0.47
+Release: 0.4.20090301svn%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
-Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-Patch0: inkscape-0.46-cxxinclude.patch
-Patch1: inkscape-0.46-desktop.patch
-Patch2: inkscape-0.46pre2-icons.patch
-Patch3: inkscape-0.46-fixlatex.patch
-Patch4: inkscape-0.46-gtkopen.patch
-Patch5: inkscape-0.46-gtk2.13.3.patch
-Patch6: inkscape-0.46-poppler-0.8.3.patch
-Patch7: inkscape-0.46-uniconv.patch
-Patch8: inkscape-0.46-colors.patch
-Patch9: inkscape-0.46-bitmap-fonts.patch
+#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+# svn export -r20798 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@20798 inkscape
+# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
+# Chuck the SVN snapshot specific blocks when bumping to a release:
+# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
+Source0: %{name}.tar.lzma
+
+Patch0: inkscape-0.46+devel-uniconv.patch
+Patch1: inkscape-20090227svn-gcc44.patch
+Patch2: inkscape-20090226svn-oldcairo.patch
+# BEGIN SVN SNAPSHOT SPECIFIC
+Patch3: inkscape-20090227svn-automake.patch
+# END SVN SNAPSHOT SPECIFIC
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,75 +41,114 @@
BuildRequires: pkgconfig
BuildRequires: lcms-devel >= 1.13
BuildRequires: cairo-devel
-BuildRequires: openssl-devel
BuildRequires: dos2unix
-BuildRequires: perl-XML-Parser
BuildRequires: python-devel
BuildRequires: poppler-devel
BuildRequires: loudmouth-devel
BuildRequires: boost-devel
-
-# Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
-# rely on popt otherwise
-%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6
-BuildRequires: popt
-%else
+BuildRequires: gsl-devel
+BuildRequires: libwpg-devel
+BuildRequires: ImageMagick-c++-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: perl(ExtUtils::Embed)
+BuildRequires: intltool
+# A packaging bug in EL-5
+%if 0%{?fedora > 6}
BuildRequires: popt-devel
+%else
+BuildRequires: popt
%endif
-
+# BEGIN SVN SNAPSHOT SPECIFIC
+BuildRequires: autoconf
+BuildRequires: automake
+# END SVN SNAPSHOT SPECIFIC
+
+# Incompatible license
+BuildConflicts: openssl-devel
+
+# Disable all for now. TODO: Be smarter
+%if 0
+Requires: dia
Requires: pstoedit
+Requires: ghostscript
Requires: perl(Image::Magick)
+Requires: tex(latex)
+Requires: tex(dvips)
+Requires: transfig
+Requires: gimp
Requires: numpy
-Requires: PyXML
Requires: python-lxml
Requires: uniconvertor
+# TODO: Deal with these (autoreqs, disabled now):
+# perl(Cwd)
+# perl(Exporter)
+# perl(File::Basename)
+# perl(Getopt::Long)
+# perl(Getopt::Std)
+# perl(MIME::Base64)
+# perl(Pod::Usage)
+# perl(SVG)
+# perl(SVG::Parser)
+# perl(XML::XQL)
+# perl(XML::XQL::DOM)
+# perl(strict)
+# perl(vars)
+# perl(warnings)
+%endif
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+# Filter out perl requires and provides
+# XXX: For now _all_
+%global __perl_provides %{nil}
+%global __perl_requires %{nil}
+
%description
-Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
-Illustrator® from the proprietary software world, and Sketch or Karbon14 from
-the free software world. It is free software, distributed under the terms of
-the Gnu General Public License, Version 2.
-
-Inkscape uses W3C SVG as its native file format. It is therefore a very useful
-tool for web designers and as an interchange format for desktop publishing.
-
-It has a relatively modern display engine, giving you finely antialiased
-display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
+Inkscape is a vector graphics editor, with capabilities similar to
+Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector
+Graphics (SVG) file format. It is therefore a very useful tool for web
+designers and as an interchange format for desktop publishing.
+
+Inkscape supports many advanced SVG features (markers, clones, alpha
+blending, etc.) and great care is taken in designing a streamlined
+interface. It is very easy to edit nodes, perform complex path operations,
+trace bitmaps and much more.
%prep
-%setup -q
-%patch0 -p1 -b .cxxinclude
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .icons
-%patch3 -p1 -b .fixlatex
-%patch4 -p0 -b .gtkopen
-%patch5 -p1 -b .gtk2.13.3
-%patch6 -p1 -b .poppler-0.8.3
-%patch7 -p1 -b .uniconv
-%patch8 -p2 -b .colors
-%patch9 -p1 -b .bitmap-fonts
-find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
-find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
+%setup -q -n %{name}
+%patch0 -p1 -b .uniconv
+%patch1 -p1 -b .gcc44
+%patch2 -p0 -b .oldcairo
+# BEGIN SVN SNAPSHOT SPECIFIC
+%patch3 -p0 -b .automake
+# END SVN SNAPSHOT SPECIFIC
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# A couple of files have executable bits set,
+# despite not being executable
+(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
+ find share/extensions -name '*.py' -perm +111
+) |xargs chmod -x
+
+# Fix end of line encodings
dos2unix -k -q share/extensions/*.py
%build
-%configure \
---disable-dependency-tracking \
---with-xinerama \
---enable-static=no \
---with-python \
---with-perl \
---with-gnome-vfs \
---with-inkjar \
---enable-inkboard \
---enable-lcms \
---enable-poppler-cairo
+# BEGIN SVN SNAPSHOT SPECIFIC
+sh autogen.sh
+# END SVN SNAPSHOT SPECIFIC
+%configure \
+ --with-python \
+ --with-perl \
+ --with-gnome-vfs \
+ --with-xft \
+ --enable-lcms \
+ --enable-poppler-cairo \
+ --disable-dependency-tracking
+# --enable-inkboard \
make %{?_smp_mflags}
@@ -111,15 +156,21 @@
%install
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 {} ';'
-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 \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+# No skencil anymore
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
+
+%find_lang %{name}
+
-desktop-file-install --vendor fedora --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%check
+# XXX: Tests fail, ignore it for now
+make -k check || :
%clean
@@ -127,27 +178,64 @@
%post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+exec >/dev/null 2>&1
+update-desktop-database %{_datadir}/applications || :
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+exec >/dev/null 2>&1
+update-desktop-database %{_datadir}/applications || :
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/fr/man1/*
+%{_bindir}/inkscape
+%{_bindir}/inkview
+%{_datadir}/inkscape
+%{_datadir}/applications/fedora-inkscape.desktop
+%{_datadir}/icons/hicolor/scalable/apps/inkscape.svg
+%{_datadir}/pixmaps/inkscape.png
+%{_mandir}/man1/inkscape.1*
+%{_mandir}/man1/inkview.1*
+%{_mandir}/fr/man1/inkscape.1*
%changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Mar 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.4.20090301svn
+- Bump to later SVN snapshot to fix inkscape/+bug/331864
+- Fix a startup crash when compiled with GCC 4.4
+- It even runs now! :)
+
+* Tue Feb 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.4.20090227svn
+- Enable the test suite
+
+* Tue Feb 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090227svn
+- Past midnight! :)
+- More recent snapshot, our gcc44 fixes now upstream
+- One more gcc44 fix, it even compiles now
+- We install icons now, update icon cache
+- Disable inkboard, for it won't currently compile
+
+* Tue Feb 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090226svn
+- Later snapshot
+- Compile with GCC 4.4
+
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090105svn
+- Update to newer SVN
+- Drop upstreamed patches
+- Enable WordPerfect Graphics support
+- Enable embedded Perl scripting
+- Enable Imagemagick support
+- Disable OpenSSL due to licensing issues
+
+* Thu Aug 14 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20080814svn
+- Update to today's SVN snapshot
+- Drop the upstreamed poppler patch
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.46-10
- rebuild with new openssl
@@ -157,17 +245,15 @@
* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.46-8
- Rebuild for Python 2.6
+>>>>>>> 1.63
-* Fri Nov 28 2008 Caolán McNamara <caolanm at redhat.com> - 0.46-7
-- rebuild for dependencies
-
-* Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6
-- Fix color sliders with recent GTK (#467431)
-
-* Wed Aug 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-5
+* Wed Aug 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.2.20080705svn
- Rediff patches for zero fuzz
- Use uniconvertor to handle CDR and WMF (#458845)
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.1.20080705svn
+- Subversion snapshot
+
* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-4
- Fix compile issues with newer gtk and poppler
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 25 Mar 2008 16:27:22 -0000 1.16
+++ sources 2 Mar 2009 21:27:11 -0000 1.17
@@ -1 +1 @@
-59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2
+8803034773154e5d90e3bdac7de7ab30 inkscape.tar.lzma
--- inkscape-0.46-bitmap-fonts.patch DELETED ---
--- inkscape-0.46-colors.patch DELETED ---
--- inkscape-0.46-cxxinclude.patch DELETED ---
--- inkscape-0.46-desktop.patch DELETED ---
--- inkscape-0.46-fixlatex.patch DELETED ---
--- inkscape-0.46-gtk2.13.3.patch DELETED ---
--- inkscape-0.46-gtkopen.patch DELETED ---
--- inkscape-0.46-poppler-0.8.3.patch DELETED ---
--- inkscape-0.46-uniconv.patch DELETED ---
--- inkscape-0.46pre2-icons.patch DELETED ---
More information about the fedora-extras-commits
mailing list