From a91ccf2cb1dfcfae84692d2b8713a2cfcd524e8f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Aug 10 2009 05:26:10 +0000
Subject: Merge from devel


---

diff --git a/.cvsignore b/.cvsignore
index b4a5d39..d91002b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-inkscape.tar.lzma
+inkscape.tar.xz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..81eb9c6
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+inkscape-0_47-0_15_pre1_20090810svn_fc12:F-10:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249881732
diff --git a/inkscape-20090508svn-crc32.patch b/inkscape-20090508svn-crc32.patch
deleted file mode 100644
index 41eabbe..0000000
--- a/inkscape-20090508svn-crc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-CRC-32 for 64-bit systems is calculated incorrectly,
-resulting in corrupted ODG exported files.
-
-https://bugs.launchpad.net/inkscape/+bug/275519
-https://bugzilla.redhat.com/show_bug.cgi?id=499088
-
-Lubomir Rintel
-
-diff -up inkscape/src/dom/util/ziptool.cpp.crc32 inkscape/src/dom/util/ziptool.cpp
---- inkscape/src/dom/util/ziptool.cpp.crc32	2009-05-18 06:12:56.000000000 +0200
-+++ inkscape/src/dom/util/ziptool.cpp	2009-05-18 06:13:31.000000000 +0200
-@@ -158,6 +158,8 @@ void Crc32::reset()
- void Crc32::update(unsigned char b)
- {
-     unsigned long c = ~value;
-+
-+    c &= 0xffffffff;
-     c = crc_table[(c ^ b) & 0xff] ^ (c >> 8);
-     value = ~c;
- }
diff --git a/inkscape.spec b/inkscape.spec
index 095b119..ae72297 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,20 +1,21 @@
+%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
+
 Name:           inkscape
 Version:        0.47
-Release:        0.12.pre0.20090616svn%{?dist}
+Release:        0.15.pre1.20090810svn%{?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 -r21597 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@21597 inkscape
-# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
+# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22040 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
-Source0:        %{name}.tar.lzma
+Source0:        %{name}.tar.xz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch1:         inkscape-20090508svn-crc32.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -135,7 +136,6 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch1 -p1 -b .crc32
 %patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -232,6 +232,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.13.pre0.20090629svn
+- Update to a newer snapshot
+
 * Tue Jun 16 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.12.pre0.20090616svn
 - Update to post-pre0 snapshot
 
diff --git a/sources b/sources
index d6a4876..95fa44a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-637c3546b0d6953bcbdfee6f7c4bb8e0  inkscape.tar.lzma
+13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz