From 3775cb967a9ca4ef60031fab1efe3723880e3290 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Aug 19 2013 16:18:43 +0000
Subject: - update to 1.4.3 (#990030)


---

diff --git a/.gitignore b/.gitignore
index 18bf60a..0f27afd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ scribus-1.3.8.tar.bz2
 /scribus-1.4.1.tar.xz
 /scribus-1.4.1.tar.xz.asc
 /scribus-1.4.2-free.tar.xz
+/scribus-1.4.3-free.tar.xz
diff --git a/make-free-archive.sh b/make-free-archive.sh
index 2c4ea0c..62176bc 100644
--- a/make-free-archive.sh
+++ b/make-free-archive.sh
@@ -28,9 +28,12 @@ rm scribus/profiles/{sRGB.icm,srgb.license}
 # remove non-free content from swatches
 rm resources/swatches/*.eps
 rm resources/swatches/dtp-studio-free-palettes-license.rtf
+
 rm resources/swatches/GiveLife_Color_System_*.xml
 rm resources/swatches/givelife_colors_license.rtf
 
+rm resources/swatches/Federal_Identity_Program.xml
+
 popd
 
 echo "Creating sources ..."
diff --git a/scribus-pillow.patch b/scribus-pillow.patch
deleted file mode 100644
index d135f6c..0000000
--- a/scribus-pillow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: scribus-1.4.2/scribus/plugins/scriptplugin/scripts/FontSample.py
-===================================================================
---- scribus-1.4.2.orig/scribus/plugins/scriptplugin/scripts/FontSample.py
-+++ scribus-1.4.2/scribus/plugins/scriptplugin/scripts/FontSample.py
-@@ -154,7 +154,7 @@ if not os.path.exists(CONFIG_PATH):
- 
- 
- try:
--    import Image
-+    from PIL import Image
- except ImportError,err:
-     print 'You need to install Python Imaging Library (PIL).'
-     print 'If using gentoo then you need to emerge /dev-python/imaging'
-@@ -164,7 +164,7 @@ except ImportError,err:
- 
- 
- try:
--    import ImageTk
-+    from PIL import ImageTk
- except ImportError,err:
-     print 'Module ImageTk not found, font preview disabled'
-     showPreviewPanel = 0
diff --git a/scribus.spec b/scribus.spec
index 77b0eff..8a4421b 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.4.2
-Release:        7%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -16,8 +16,6 @@ Patch0:         %{name}-1.4.0-docdir.patch
 Patch1:         %{name}-to-double.patch
 # fix build with non-free content removed
 Patch2:         %{name}-1.4.2-nonfree.patch
-# update for Pillow (#896301)
-Patch3:         %{name}-pillow.patch
 
 BuildRequires:  cmake
 
@@ -69,7 +67,6 @@ import/export and creation of color separations.
 %patch0 -p1 -b .docdir
 %patch1 -p1 -b .double
 %patch2 -p1 -b .nonfree
-%patch3 -p1 -b .pillow
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -148,6 +145,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
+- update to 1.4.3 (#990030)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 7a2f3a4..e7fab26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45b14e0898772fa0c727019ae27adc8d  scribus-1.4.2-free.tar.xz
+f63f615842f05fb36cd5401bcaa54386  scribus-1.4.3-free.tar.xz