rpms/inkscape/F-8 .cvsignore, 1.13, 1.14 inkscape-0.45.1-desktop.patch, 1.1, 1.2 inkscape.spec, 1.42, 1.43 sources, 1.13, 1.14 inkscape-0.46pre1-fontsel.patch, 1.1, NONE inkscape-0.46pre1-gcc43.patch, 1.1, NONE inkscape-0.46pre1-ocal1.patch, 1.1, NONE inkscape-0.46pre1-ocal2.patch, 1.1, NONE inkscape-0.46pre1-vectors.patch, 1.1, NONE

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12528/F-8

Modified Files:
	.cvsignore inkscape-0.45.1-desktop.patch inkscape.spec sources 
Removed Files:
	inkscape-0.46pre1-fontsel.patch inkscape-0.46pre1-gcc43.patch 
	inkscape-0.46pre1-ocal1.patch inkscape-0.46pre1-ocal2.patch 
	inkscape-0.46pre1-vectors.patch 
Log Message:
0.46pre2, merge from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Feb 2008 02:33:28 -0000	1.13
+++ .cvsignore	21 Feb 2008 23:37:30 -0000	1.14
@@ -1 +1 @@
-inkscape-0.45.1+0.46pre1.tar.bz2
+inkscape-0.45+0.46pre2.tar.bz2

inkscape-0.45.1-desktop.patch:

Index: inkscape-0.45.1-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape-0.45.1-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inkscape-0.45.1-desktop.patch	2 Dec 2007 14:46:53 -0000	1.1
+++ inkscape-0.45.1-desktop.patch	21 Feb 2008 23:37:30 -0000	1.2
@@ -1,6 +1,8 @@
 Make desktop-file-validate and rpmlint happy, handle compressed svgs (#245413)
 and let it conform enough not to break the build in Rawhide.
+
 (Lubomir Kundrak <lkundrak at redhat.com>)
+https://bugs.launchpad.net/inkscape/+bug/190420
 
 --- inkscape-0.45.1.orig/inkscape.desktop.in	2007-01-16 03:49:00.000000000 +0100
 +++ inkscape-0.45.1/inkscape.desktop.in	2007-12-02 03:17:08.000000000 +0100


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- inkscape.spec	16 Feb 2008 14:12:27 -0000	1.42
+++ inkscape.spec	21 Feb 2008 23:37:30 -0000	1.43
@@ -1,19 +1,14 @@
 Name:           inkscape
-Version:        0.45.1+0.46pre1
-Release:        5%{?dist}
+Version:        0.46
+Release:        0.1.pre2%{?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.bz2
+Source0:        http://download.sourceforge.net/inkscape/inkscape-0.45+0.46pre2.tar.bz2
 Patch0:         inkscape-16571-cxxinclude.patch
 Patch1:         inkscape-0.45.1-desktop.patch
-Patch2:         inkscape-0.46pre1-gcc43.patch
-Patch3:         inkscape-0.46pre1-vectors.patch
-Patch4:         inkscape-0.46pre1-ocal1.patch
-Patch5:         inkscape-0.46pre1-ocal2.patch
-Patch6:         inkscape-0.46pre1-fontsel.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,14 +60,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.45+0.46pre2
 %patch0 -p1 -b .cxxinclude
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .vectors
-%patch4 -p1 -b .ocal1
-%patch5 -p1 -b .ocal2
-%patch6 -p0 -b .fontsel
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -132,6 +122,10 @@
 
 
 %changelog
+* Sun Feb 17 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-0.1.pre2
+- 0.46pre2
+- Dropping upstreamed patches
+
 * Sat Feb 16 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-5
 - Attempt to fix the font selector (#432892)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Feb 2008 02:33:28 -0000	1.13
+++ sources	21 Feb 2008 23:37:30 -0000	1.14
@@ -1 +1 @@
-2b3b31cb92c558a68534f190d31b0d72  inkscape-0.45.1+0.46pre1.tar.bz2
+b08fd4821c9f44fdab1b2d7ca4e9531d  inkscape-0.45+0.46pre2.tar.bz2


--- inkscape-0.46pre1-fontsel.patch DELETED ---


--- inkscape-0.46pre1-gcc43.patch DELETED ---


--- inkscape-0.46pre1-ocal1.patch DELETED ---


--- inkscape-0.46pre1-ocal2.patch DELETED ---


--- inkscape-0.46pre1-vectors.patch DELETED ---