merge

make-free-archive.sh

@@ -29,6 +29,11 @@ rm scribus/profiles/{sRGB.icm,srgb.license}
 rm resources/swatches/*.eps
 rm resources/swatches/dtp-studio-free-palettes-license.rtf
 
+rm resources/swatches/Galaxy_*
+rm resources/swatches/Resene_*
+rm resources/swatches/COPYING_RESENE.txt
+rm resources/swatches/NAA*
+
 rm resources/swatches/GiveLife_Color_System_*.xml
 rm resources/swatches/givelife_colors_license.rtf
 

scribus.spec

@@ -1,9 +1,10 @@
 Name:           scribus
 Version:        1.4.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        DeskTop Publishing application written in Qt
 Group:          Applications/Productivity
-License:        GPLv2+
+# swatches bring in the fun licenses
+License:        GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ 
 URL:            http://www.scribus.net/
 # ./make-free-archive %{version}
 Source0:        %{name}-%{version}-free.tar.xz
@@ -186,9 +187,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Jan 12 2016 Tom Callaway <spot@fedoraproject.org> - 1.4.5-7
+- fix license tag, remove found non-free swatches (bz 1297262)
+
 * Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 1.4.5-6
 - Use a bigger resolution application icon
 
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-5
+- Rebuilt for Boost 1.59
+
 * Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
 

sources

@@ -1 +1 @@
-6c0b6d130b0328964c640ea7a6120480  scribus-1.4.5-free.tar.xz
+e72d488c8993f025ca796f32e01351a4  scribus-1.4.5-free.tar.xz