rpms/inkscape/EL-5 import.log, 1.1, 1.2 inkscape.spec, 1.41, 1.42 sources, 1.14, 1.15

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7234/EL-5

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 17:10:24 -0000	1.1
+++ import.log	7 Oct 2009 12:50:43 -0000	1.2
@@ -1 +1,2 @@
 inkscape-0_47-0_16_pre3_20090925svn_fc12:EL-5:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898601
+inkscape-0_47-0_16_pre3_20091017svn_fc13:EL-5:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254914012


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- inkscape.spec	26 Sep 2009 07:25:07 -0000	1.41
+++ inkscape.spec	7 Oct 2009 12:50:43 -0000	1.42
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}.1
+Release:        0.16.pre3.20091017svn%{?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
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -38,13 +38,7 @@ BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
 BuildRequires:  gsl-devel
-%if 0%{el5}
-%ifnarch ppc
 BuildRequires:  libwpg-devel
-%endif
-%else
-BuildRequires:  libwpg-devel
-%endif
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::Embed)
@@ -224,8 +218,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn.1
-- Do not use wpg on EL-5 w/o Desktop (ppc)
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
 
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 17:10:24 -0000	1.14
+++ sources	7 Oct 2009 12:50:43 -0000	1.15
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz