[scribus/f19] 1.4.4, remove non-free dot files
Dan Horák
sharkcz at fedoraproject.org
Thu Aug 28 14:42:00 UTC 2014
commit ff79b8f59a9940a36ef8ec35a7bec0d61c2d128f
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Jun 6 17:43:10 2014 -0400
1.4.4, remove non-free dot files
.gitignore | 1 +
make-free-archive.sh | 3 +++
scribus-1.4.2-nonfree.patch | 11 +++++++++++
scribus.spec | 7 +++++--
sources | 2 +-
5 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f27afd..3821ef3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ scribus-1.3.8.tar.bz2
/scribus-1.4.1.tar.xz.asc
/scribus-1.4.2-free.tar.xz
/scribus-1.4.3-free.tar.xz
+/scribus-1.4.4-free.tar.xz
diff --git a/make-free-archive.sh b/make-free-archive.sh
old mode 100644
new mode 100755
index 62176bc..028d757
--- a/make-free-archive.sh
+++ b/make-free-archive.sh
@@ -34,6 +34,9 @@ rm resources/swatches/givelife_colors_license.rtf
rm resources/swatches/Federal_Identity_Program.xml
+# Remove non-free (CC-BY-SA-NC) dot files
+rm resources/editorconfig/dot.*
+
popd
echo "Creating sources ..."
diff --git a/scribus-1.4.2-nonfree.patch b/scribus-1.4.2-nonfree.patch
index 94248a2..7f13fe6 100644
--- a/scribus-1.4.2-nonfree.patch
+++ b/scribus-1.4.2-nonfree.patch
@@ -35,3 +35,14 @@ Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
-srgb.license
DESTINATION ${SHAREDIR}profiles
)
+diff -up scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot scribus-1.4.4/resources/editorconfig/CMakeLists.txt
+--- scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot 2014-06-06 17:22:12.258966553 -0400
++++ scribus-1.4.4/resources/editorconfig/CMakeLists.txt 2014-06-06 17:22:16.326936717 -0400
+@@ -12,7 +12,6 @@ gnuplot.png
+ 300_lilypond.xml
+ lilypond.png
+ 400_dot.xml
+-dot.svg
+ 500_povray.xml
+ povray_32.png
+
diff --git a/scribus.spec b/scribus.spec
index 2b2b973..998cc22 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
Name: scribus
-Version: 1.4.3
-Release: 2%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
Summary: DeskTop Publishing application written in Qt
@@ -145,6 +145,9 @@ update-desktop-database &> /dev/null || :
%changelog
+* Fri Jun 6 2014 Tom Callaway <spot at fedoraproject.org> - 1.4.4-1
+- update to 1.4.4, drop non-free dot files
+
* Thu Sep 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-2
- fix the double patch (#1009979)
diff --git a/sources b/sources
index e7fab26..8ea4abe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f63f615842f05fb36cd5401bcaa54386 scribus-1.4.3-free.tar.xz
+1373e797409c1d6477a1f3cb9d061d0e scribus-1.4.4-free.tar.xz
More information about the scm-commits
mailing list