[egoboo] Switch over to using a cleaned tarball
Bruno Wolff III
bruno at fedoraproject.org
Tue Mar 13 02:53:08 UTC 2012
commit 25058741dfb557b03f1523eee0c8f38f53ef7835
Author: Bruno Wolff III <bruno at wolff.to>
Date: Mon Mar 12 20:34:58 2012 -0500
Switch over to using a cleaned tarball
There was at least one non-free font in the tarball as well as
some PDF files covered by the GPL that we might have been obligated
to provide source files for (that we don't have).
.gitignore | 1 +
egoboo.spec | 13 +++++++++++--
generate-tarball.sh | 12 ++++++++++++
sources | 2 +-
4 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ff0da7..14bb2d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
egoboo-2.7.5.tar.gz
/egoboo-2.8.1.tar.gz
+/egoboo-clean-2.8.1.tar.gz
diff --git a/egoboo.spec b/egoboo.spec
index d95dc10..c657aae 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -5,8 +5,16 @@ Summary: A top down graphical (3D) RPG in the spirit of Nethack
Group: Amusements/Games
License: GPLv3
URL: http://egoboo.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# The upstream tarball contains at least one non-free font and pdf files
+# that we might be obligated to provide source to, so we need to use
+# a tarball with these items removed.
+# The original source is at:
+# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: %{name}-clean-%{version}.tar.gz
Source1: %{name}.desktop
+# The following script is used to make a clean tarball
+# Set the version in the script and then run it
+Source2: generate-tarball.sh
Patch0: egoboo-opts.patch
Patch1: egoboo-noenet.patch
Patch2: egoboo-enet13.patch
@@ -29,7 +37,7 @@ dimension.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
%patch0 -b .opts
%patch1 -b .noenet
%patch2 -b .enet13
@@ -72,6 +80,7 @@ desktop-file-install --vendor fedora \
* Sun Mar 11 2012 Bruno Wolff III <bruno at wolff.to> 2.8.1-1
- Update to upstream 2.8.1
- Changelog: http://egoboo.sourceforge.net/forum/viewtopic.php?p=1119#1119
+- Use cleaned tarball
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..a164e6d
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Egoboo's standard tar file includes at least one font file that is
+# non-free.
+# It also includes some pdf files that were most likely generated from
+# other sources, not in the tar file and are covered by the GPL.
+
+VERSION=2.8.1
+
+tar xf egoboo-${VERSION}.tar.gz
+find egoboo-${VERSION} \( -name \*.ttf -o -name \*.pdf \) -delete -print
+tar cfz egoboo-clean-${VERSION}.tar.gz egoboo-${VERSION}
diff --git a/sources b/sources
index 1c1c746..3c7e0a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6f3130695d297dcd9fe74e50bd59b68 egoboo-2.8.1.tar.gz
+51f5d8d664ac41e6995df03e4f049b2f egoboo-clean-2.8.1.tar.gz
More information about the scm-commits
mailing list