[fbg2/f17] replace sound trademark
Tom Callaway
spot at fedoraproject.org
Tue Apr 2 16:09:29 UTC 2013
commit 378e4edba4918984a31660ae5632ab5347f1a49a
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Apr 2 12:12:49 2013 -0400
replace sound trademark
README.music | 3 +++
RudySeb_-_russian.ogg | Bin 0 -> 3294888 bytes
fbg2.spec | 23 ++++++++++++++++++++---
sources | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/README.music b/README.music
new file mode 100644
index 0000000..188f60d
--- /dev/null
+++ b/README.music
@@ -0,0 +1,3 @@
+It turns out that "Korobeiniki" is a registered sound trademark, associated with a popular falling blocks game.
+For that reason, we cannot use it in this falling blocks game. Instead, I've replaced it with "russian" by RudySeb.
+That track is licensed under the Creative Commons Attribution Share-Alike 3.0 License (CC-BY-SA). Enjoy!
diff --git a/RudySeb_-_russian.ogg b/RudySeb_-_russian.ogg
new file mode 100644
index 0000000..22acd30
Binary files /dev/null and b/RudySeb_-_russian.ogg differ
diff --git a/fbg2.spec b/fbg2.spec
index c2116cb..f51be13 100644
--- a/fbg2.spec
+++ b/fbg2.spec
@@ -1,12 +1,21 @@
Name: fbg2
Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A falling block stacking game
Group: Amusements/Games
# Code is GPLv2+, music and graphics are CC-BY-SA
License: GPLv2+ and CC-BY-SA
URL: http://sourceforge.net/projects/fbg/
-Source0: http://downloads.sourceforge.net/project/fbg/%{name}-%{version}.tar.gz
+# Cannot use this source as is. Need to remove
+# fbg2-0.4/Data/Music/FallingBlockGameSndTrk.ogg
+# because it is a sound trademark associated with a popular
+# falling blocks game.
+# rm -rf fbg2-0.4/Data/Music/FallingBlockGameSndTrk.ogg
+# Source0: http://downloads.sourceforge.net/project/fbg/%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}-clean.tar.gz
+# http://www.jamendo.com/en/track/165311/russian
+Source1: RudySeb_-_russian.ogg
+Source2: README.music
Patch0: fbg2-0.4-desktop-fix.patch
BuildRequires: radius-engine-devel >= 0.7, desktop-file-utils, zip
@@ -18,6 +27,8 @@ more rows you clear at once, the more points you score!
%prep
%setup -q
%patch0 -p1 -b .fix
+cp %{SOURCE1} Data/Music/FallingBlockGameSndTrk.ogg
+cp %{SOURCE2} .
chmod -x License.txt ChangeLog *.c
%build
@@ -29,13 +40,19 @@ make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/fbg2.desktop
%files
-%doc License.txt ChangeLog
+%doc License.txt ChangeLog README.music
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Tue Apr 2 2013 Tom Callaway <spot at fedoraproject.org> - 0.4-6
+- remove sound trademark music
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Tue Sep 4 2012 Tom Callaway <spot at fedoraproject.org> - 0.4-4
- rebuild for new radius-engine
diff --git a/sources b/sources
index a44ecd5..b0f7d0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-119fe15939882fee97195aea2bc2ccba fbg2-0.4.tar.gz
+7f76dab4686fdcd45c2d6b2fffc7f5a8 fbg2-0.4-clean.tar.gz
More information about the scm-commits
mailing list