From d87d166b5673829811582a28b68c3ecf962bfc74 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 25 Mar 2008 16:59:15 +0000 Subject: [PATCH] merge from devel --- .cvsignore | 2 +- inkscape.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ee7f357..883ac0a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -inkscape-0.45+0.46pre3.tar.bz2 +inkscape-0.46.tar.bz2 diff --git a/inkscape.spec b/inkscape.spec index b2bd070..7fd2b02 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,12 +1,12 @@ Name: inkscape Version: 0.46 -Release: 0.2.pre3%{?dist} +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-0.45+0.46pre3.tar.bz2 +Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 Patch0: inkscape-16571-cxxinclude.patch Patch1: inkscape-0.45.1-desktop.patch Patch2: inkscape-0.46pre2-icons.patch @@ -61,7 +61,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %prep -%setup -q -n %{name}-0.45+0.46pre3 +%setup -q %patch0 -p1 -b .cxxinclude %patch1 -p1 -b .desktop %patch2 -p1 -b .icons @@ -124,6 +124,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Tue Mar 25 2008 Lubomir Kundrak - 0.46-1 +- 0.46 released + +* Sun Mar 23 2008 Lubomir Kundrak - 0.46-0.3.pre3 +- Rebuild for newer Poppler + * Wed Mar 12 2008 Lubomir Kundrak - 0.46-0.2.pre3 - Probably last prerelease? diff --git a/sources b/sources index ab73a27..deb5c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0daed93fbf24da295499d844b54be621 inkscape-0.45+0.46pre3.tar.bz2 +59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2