[clonekeen] 0.8.4
Tom Callaway
spot at fedoraproject.org
Sun Sep 9 14:22:52 UTC 2012
commit d45172d0e30c8e2dc49b03afde81f61251e26c19
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sun Sep 9 10:23:50 2012 -0400
0.8.4
.gitignore | 2 +
clonekeen-0.8.4-noSDLmain.patch | 12 +++++++++++
clonekeen.sh | 18 +++++++++++++++++
clonekeen.spec | 41 ++++++++++++++++++++-------------------
sources | 4 +-
5 files changed, 55 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1794da3..42f7425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
CKBeta83_Src.zip
clonekeen-0.8.3-data.tar.gz
+/clonekeen-0.8.4-data.tar.gz
+/clonekeen-src-84-clean.tar.gz
diff --git a/clonekeen-0.8.4-noSDLmain.patch b/clonekeen-0.8.4-noSDLmain.patch
new file mode 100644
index 0000000..a1f48df
--- /dev/null
+++ b/clonekeen-0.8.4-noSDLmain.patch
@@ -0,0 +1,12 @@
+diff -up keen/src/Makefile.noSDLmain keen/src/Makefile
+--- keen/src/Makefile.noSDLmain 2012-09-07 15:48:18.645302133 -0400
++++ keen/src/Makefile 2012-09-07 15:48:27.746305283 -0400
+@@ -36,7 +36,7 @@ keen: main.o sanity.o game.o gamedo.o \
+ ai/autoray.o ai/gotpoints.o sdl/keydrv.o sdl/snddrv.o sdl/timedrv.o \
+ sdl/viddrv.o scale2x/scalebit.o scale2x/scale2x.o scale2x/scale3x.o scale2x/pixel.o \
+ platform.o \
+- -lSDL -lSDLmain -lstdc++
++ -lSDL -lstdc++ -lm
+
+ main.o: main.c main.fdh keen.h osparam.h \
+ sounds.h latch.h game.h \
diff --git a/clonekeen.sh b/clonekeen.sh
index 185c651..0189680 100644
--- a/clonekeen.sh
+++ b/clonekeen.sh
@@ -8,6 +8,24 @@ if [ ! -d ~/.clonekeen ]; then
cp -a /usr/share/clonekeen/data ~/.clonekeen
fi
+# We have to do it like this to support migration from 0.8.3 to 0.8.4
+if [ ! -f ~/.clonekeen/demolvl.ck1 ]; then
+ cp -p /usr/share/clonekeen/demolvl.ck1 ~/.clonekeen
+fi
+
+if [ ! -f ~/.clonekeen/flags.ini ]; then
+ cp -p /usr/share/clonekeen/flags.ini ~/.clonekeen
+fi
+
+if [ ! -f ~/.clonekeen/palette.ini ]; then
+ cp -p /usr/share/clonekeen/palette.ini ~/.clonekeen
+fi
+
+if [ ! -d ~/.clonekeen/gfx ]; then
+ mkdir ~/.clonekeen/gfx
+ cp -p /usr/share/clonekeen/gfx/* ~/.clonekeen/gfx
+fi
+
if [ ! -f ~/.clonekeen/data/storytxt.ck1 ]; then
set +e
/usr/share/autodl/AutoDL.py /usr/share/clonekeen/clonekeen.autodlrc
diff --git a/clonekeen.spec b/clonekeen.spec
index 1da0e72..649d2df 100644
--- a/clonekeen.spec
+++ b/clonekeen.spec
@@ -1,28 +1,25 @@
Name: clonekeen
-Version: 0.8.3
-Release: 10%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
Summary: "Commander Keen: Invasion of the Vorticons" clone
Group: Amusements/Games
-License: GPLv2+
+License: GPLv3+
URL: http://clonekeen.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/CKBeta83_Src.zip
+# We make a clean tarball by removing bin/data/sound*
+# from http://clonekeen.sourceforge.net/files/%{name}-src-84.tar.gz
+Source0: %{name}-src-84-clean.tar.gz
# This are the .dat files and the extra (GPL) levels from
# http://downloads.sourceforge.net/%{name}/CKBeta83_Bin_W32.zip
-# ep1attr.dat and ep3attr.dat are replaced with improved versions from
-# http://jonathannielsen.com/mw/CloneKeen2X-1.0-src.zip
# The pristine upstream .zip's aren't used because the included sounds.ck?
# files are property of id Software
-Source1: %{name}-%{version}-data.tar.gz
+Source1: %{name}-0.8.4-data.tar.gz
Source2: extract.c
Source3: clonekeen-extract-sounds.c
Source4: %{name}.sh
Source5: %{name}.autodlrc
Source6: %{name}.desktop
Source7: %{name}.png
-Patch0: %{name}-fixes.patch
-Patch1: %{name}-clonekeen2x-fixes.patch
-Patch2: %{name}-options.patch
-Patch3: %{name}-missing-protos.patch
+Patch0: %{name}-0.8.4-noSDLmain.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_mixer-devel dynamite-devel desktop-file-utils
Requires: hicolor-icon-theme autodownloader
@@ -42,17 +39,15 @@ the shareware datafiles for you.
%prep
%setup -q -a 1 -n keen
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1 -b .noSDLmain
+sed -i 's|gcc -O2|gcc %{optflags}|g' src/Makefile
cp -a %{SOURCE2} %{SOURCE3} .
-rm src/scale2x/*.o
-sed -i 's/\r//g' readme.txt src/changelog.txt
+# rm src/scale2x/*.o
+sed -i 's/\r//g' README src/changelog.txt
%build
-make %{?_smp_mflags} -C src -f Makefile.lnx CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} -C src -f Makefile CFLAGS="$RPM_OPT_FLAGS"
gcc -o %{name}-extract $RPM_OPT_FLAGS extract.c -ldynamite
gcc -o %{name}-extract-sounds $RPM_OPT_FLAGS %{name}-extract-sounds.c
@@ -62,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/data
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/gfx
install -m 755 src/keen $RPM_BUILD_ROOT%{_libexecdir}/%{name}
install -m 755 %{name}-extract $RPM_BUILD_ROOT%{_libexecdir}
@@ -69,7 +65,10 @@ install -m 755 %{name}-extract-sounds $RPM_BUILD_ROOT%{_libexecdir}
install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 bin/*.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 bin/*.ini $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 bin/gfx/* $RPM_BUILD_ROOT%{_datadir}/%{name}/gfx
install -p -m 644 bin/data/* $RPM_BUILD_ROOT%{_datadir}/%{name}/data
+install -p -m 644 bin/*.ck1 $RPM_BUILD_ROOT%{_datadir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -101,15 +100,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc readme.txt src/changelog.txt
+%doc README src/changelog.txt
%{_bindir}/%{name}
%{_libexecdir}/%{name}*
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
-
%changelog
+* Fri Sep 7 2012 Tom Callaway <spot at fedoraproject.org> - 0.8.4-1
+- update to 0.8.4
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index bb4db57..a1f868f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9aa11b4793bad38bde2eb45597adb54e CKBeta83_Src.zip
-76b38e7819d8bc90399789acfbc5a5dc clonekeen-0.8.3-data.tar.gz
+3b79d3ce248fc679bac2c5731843e9ec clonekeen-0.8.4-data.tar.gz
+980f14d32b6809aad8b410066883dffe clonekeen-src-84-clean.tar.gz
More information about the scm-commits
mailing list