[ocp] * Sun Aug 08 2010 Charles R. Anderson <cra at wpi.edu> 0.1.20-1 - update to 0.1.20 - upstream license a
Charles R. Anderson
cra at fedoraproject.org
Mon Aug 9 03:56:19 UTC 2010
commit 492ca2adf3dff5919b23d46d32cba7eff573c9fe
Author: Chuck Anderson <cra at wpi.edu>
Date: Sun Aug 8 23:56:16 2010 -0400
* Sun Aug 08 2010 Charles R. Anderson <cra at wpi.edu> 0.1.20-1
- update to 0.1.20
- upstream license audit has been performed:
- all components are GPLv2+ (or compatible)
- license text added to all source files
- images and animation data remain under CC-BY
.gitignore | 3 +++
ocp.spec | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
sources | 4 +++-
3 files changed, 52 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5c0c09..2e2b9f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
ocp-snapshot-20100110.tar.bz2
+ocp-0.1.20.tar.bz2
+opencp25ani1.zip
+opencp25image1.zip
diff --git a/ocp.spec b/ocp.spec
index 74b6a60..614205e 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,6 +1,6 @@
-%define snapshot 20100110
-%define version 0.1.19
-%define release %{?snapshot:0.1.%{snapshot}snap}%{!?snapshot:1}%{?dist}
+#define snapshot 20100401
+%define version 0.1.20
+%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:1}%{?dist}
Name: ocp
Version: %{version}
@@ -8,15 +8,17 @@ Release: %{release}
Summary: Open Cubic Player for MOD/S3M/XM/IT/SID/MIDI music files
Group: Applications/Multimedia
-# Lack of any specific mention of a GPL version, so any version applies.
-# See doc/texi/ocp.text.in and doc/texi/faq.texi.
-# "OCP is published under the GNU General Public License (GPL)."
-# Requested upstream to include license header at the top of every
-# source file 2008/07/08.
-License: GPL+
+# 2010/04/04: Asked for status update. Some files are GPLv2+, some are
+# GPLv3+. Until this is clarified, it seems that GPLv2+ is the only way
+# this can be legally distributed. Graphics and animations are CC-BY.
+# 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
+# GPLv2+ license text to all source files.
+License: GPLv2+ and CC-BY
URL: http://stian.cubic.org/coding-ocp.php
%define source %{name}-%{?snapshot:snapshot-%{snapshot}}%{!?snapshot:%{version}}
-Source: http://stian.cubic.org/ocp/%{source}.tar.bz2
+Source0: http://stian.cubic.org/ocp/%{source}.tar.bz2
+Source1: ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
+Source2: ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: adplug-devel
@@ -51,6 +53,10 @@ visualizations.
%prep
%setup -q -n %{source}
+unzip %{SOURCE1}
+mv license.txt license-images.txt
+unzip %{SOURCE2}
+mv license.txt license-videos.txt
%build
@@ -61,10 +67,12 @@ visualizations.
--without-coreaudio \
--with-oss \
--with-lzw \
+ --with-lzh \
--with-flac \
--with-sdl \
--without-mad \
- --with-libiconv=auto
+ --with-libiconv=auto \
+ --with-debug
make
# Makefiles are not SMP-clean
@@ -84,9 +92,6 @@ mv %{buildroot}%{_bindir}/ultrafix.sh %{buildroot}%{_bindir}/ocp-ultrafix.sh
mv %{buildroot}%{_datadir}/%{name}-%{version}/etc/ocp.ini %{buildroot}/etc/ocp.ini
rmdir %{buildroot}%{_datadir}/%{name}-%{version}/etc
-# remove wmconfig stuff
-rm -rf %{buildroot}/etc/X11
-
# remove info/dir
rm -f %{buildroot}/%{_infodir}/dir
@@ -101,6 +106,11 @@ desktop-file-install --vendor="fedora" \
--delete-original \
%{buildroot}%{_datadir}/applications/ocp.desktop
+# install images and animations
+mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/data
+cp -p CPPIC*.TGA CPANI*.DAT %{buildroot}%{_datadir}/%{name}-%{version}/data
+cp -p license-images.txt license-videos.txt %{buildroot}%{_docdir}/%{name}-%{version}
+
%clean
rm -rf %{buildroot}
@@ -142,6 +152,28 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
%changelog
+* Sun Aug 08 2010 Charles R. Anderson <cra at wpi.edu> 0.1.20-1
+- update to 0.1.20
+- upstream license audit has been performed:
+ - all components are GPLv2+ (or compatible)
+ - license text added to all source files
+ - images and animation data remain under CC-BY
+
+* Sun Apr 04 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.5.20100401snap
+- ocp-snapshot-20100401
+- remove obsoleted patches
+- add image and animation data which is under CC Attribution 3.0 license
+
+* Fri Feb 12 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.4.20100110snap
+- add patch to fix crash in Scopes (o) and Phase (b) visualization modes.
+
+* Sat Feb 06 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.3.20100110snap
+- patch Makefiles to remove hardcoded -O flags
+
+* Mon Feb 01 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.2.20100110snap
+- --with-debug
+- patch configure to use -O0 when --with-debug is specified
+
* Tue Jan 19 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.1.20100110snap
- 0.1.19-0.1.20100110snap
diff --git a/sources b/sources
index f7c4795..d11dcbb 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-760d9f4be60002f8b5b5c51cc00661e4 ocp-snapshot-20100110.tar.bz2
+f34eca80239e619bff0593b8bf665f98 ocp-0.1.20.tar.bz2
+4df5f894e070b20d8cd65a1a620258cb opencp25ani1.zip
+72bd5f59382e927ff5b5ba1b840777df opencp25image1.zip
More information about the scm-commits
mailing list