From aae38d9874378ea0f71e63322c62103bdf2f1b9e Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Sep 07 2009 13:55:13 +0000
Subject: Merge from devel


---

diff --git a/import.log b/import.log
index c63689c..8dec1a3 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790
+inkscape-0_47-0_16_pre2_20090907svn_fc12:F-11:inkscape-0.47-0.16.pre2.20090907svn.fc12.src.rpm:1252331611
diff --git a/inkscape.spec b/inkscape.spec
index ae72297..92fd481 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -2,14 +2,14 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        0.15.pre1.20090810svn%{?dist}
+Release:        0.16.pre2.20090907svn%{?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 -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22040 inkscape
+# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22202 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
@@ -214,13 +214,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-inkscape.desktop
 %{_datadir}/pixmaps/inkscape.png
 %{_mandir}/man1/inkscape.1*
-%{_mandir}/man1/inkview.1*
 %{_mandir}/fr/man1/inkscape.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %files view
 %defattr(-,root,root,-)
 %{_bindir}/inkview
+%{_mandir}/man1/inkview.1*
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
@@ -232,6 +233,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
 * Mon Aug 10 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.15.pre1.20090629svn
 - Update to a post-pre1 snapshot
 - Drop upstreamed CRC32 fix
diff --git a/sources b/sources
index 95fa44a..ba21792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz
+2a5d70e3924f049a5d5b43cd2075cd8c  inkscape.tar.xz