[meka] Updated to a new upstream preview of version 0.80

Sat Jul 16 17:59:37 CEST 2016

commit 4c1c4fb68988f7f1c7704788193ff7200cb02ebc
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sat Jul 16 17:59:12 2016 +0200

    Updated to a new upstream preview of version 0.80
    
    - Using new upstream repository

 .gitignore                     |  1 +
 meka-0.80-format-strings.patch | 71 ------------------------------------------
 meka.desktop                   |  2 +-
 meka.sh                        |  9 ++++--
 meka.spec                      | 44 +++++++++++++++-----------
 sources                        |  2 +-
 6 files changed, 35 insertions(+), 94 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d477c3b..cd03c6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 meka-2014-10-05-srcs.zip
+/meka-0.80-f55fcdd.tar.gz
diff --git a/meka.desktop b/meka.desktop
index 3007a57..2177f16 100644
--- a/meka.desktop
+++ b/meka.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Meka
-Comment=Multi machine emulator for MS-DOS, MS-Windows and GNU/Linux
+Comment=Sega 8-bit emulator with debugging/hacking tools
 Exec=meka
 Icon=meka
 Terminal=true
diff --git a/meka.sh b/meka.sh
index 51557aa..c86a9f1 100644
--- a/meka.sh
+++ b/meka.sh
@@ -4,7 +4,7 @@ VERSION=0.80
 GAME_LOCALDIR=$HOME/.$GAME
 GAME_DATADIR=/usr/share/$GAME
 GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
-GAME_DOCDIR=/usr/share/doc/$GAME-$VERSION
+GAME_DOCDIR=/usr/share/doc/$GAME
 
 mkdir -p $GAME_LOCALDIR
 cd $GAME_LOCALDIR
@@ -18,10 +18,13 @@ for file in meka.{blt,dat,msg,nam,pat,thm}; do
 done
 
 # Create links to directory which are not (usually) modified by users
-for dir in {datafiles,Themes}; do
-        ln -sf $GAME_DATADIR/$dir $dir
+for dir in {Data,Themes}; do
+        ln -nsf $GAME_DATADIR/$dir $dir
 done
 
+# Remove old link
+rm -rf $GAME_LOCALDIR/datafiles
+
 # Copy files which can be modified by users
 for file in meka.inp; do
 	test -e $file || cp -a $GAME_DATADIR/$file $file
diff --git a/meka.spec b/meka.spec
index 8b38035..191fd00 100644
--- a/meka.spec
+++ b/meka.spec
@@ -1,22 +1,16 @@
-%global pkgdate 2014-10-05
+%global commit f55fcdd96f1ad43f01d2645f4cd7fe0b9c5c6870
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: meka
 Version: 0.80
-Release: 0.7.20141005svn%{?dist}
-Summary: Sega 8-bit machine emulator
+Release: 0.8.20150506git%{?dist}
+Summary: Sega 8-bit emulator with debugging/hacking tools
 
 License: MEKA and non-commercial
 URL: http://www.smspower.org/meka/      
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  svn export -r 496 svn://svn.smspower.org/meka/trunk/meka meka-r496
-#  cd meka-r496/
-#  zip -ro ../meka-2014-10-05-srcs.zip *
-Source0: %{name}-%{pkgdate}-srcs.zip
+Source0: https://github.com/ocornut/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 Source1: %{name}.sh
 Source2: %{name}.desktop
-# Fix format strings
-Patch0: %{name}-0.80-format-strings.patch
 
 # This is package contains ix86 asm code
 ExclusiveArch: i686 x86_64
@@ -24,10 +18,12 @@ ExclusiveArch: i686 x86_64
 BuildRequires: allegro5-devel
 BuildRequires: allegro5-addon-audio-devel
 BuildRequires: allegro5-addon-image-devel
+BuildRequires: allegro5-addon-ttf-devel
 BuildRequires: libpng-devel
 BuildRequires: ImageMagick
 BuildRequires: desktop-file-utils
 Requires: hicolor-icon-theme
+Requires: grimmer-proggy-tinysz-fonts
 
 %description
 MEKA is a multi machine emulator, originally started as a Sega Master System
@@ -48,8 +44,7 @@ You can play other systems on it only if you are smart enough to figure how.
 And if you are, I doubt you will want to play Nintendo games. So forget it.
 
 %prep
-%setup -q -c
-%patch0 -p1
+%setup -q -n %{name}-%{commit}/%{name}
 
 # Remove boundled libs
 rm -rf libs
@@ -63,6 +58,13 @@ for i in *.txt; do
   mv $i.utf8 $i
 done
 
+# Fix linking
+sed -i 's/allegro_primitives-5.0`/allegro_primitives-5.0 allegro_ttf-5.0`/' srcs/Makefile
+
+# Fix linking with allegro5
+sed -i 's/pkg-config --cflags --libs allegro-5.0 allegro_image-5.0 allegro_audio-5.0 allegro_font-5.0 allegro_primitives-5.0 allegro_ttf-5.0/pkg-config --cflags --libs allegro-5 allegro_image-5 allegro_audio-5 allegro_font-5 allegro_primitives-5 allegro_ttf-5/' srcs/Makefile
+
+
 # Compile for unix
 sed -i 's/SYSTEM = macosx/# SYSTEM = macosx/' srcs/Makefile
 sed -i 's/# SYSTEM = unix/SYSTEM = unix/' srcs/Makefile
@@ -82,10 +84,7 @@ install -d %{buildroot}/%{_libexecdir}/meka
 install -m 755 meka %{buildroot}/%{_libexecdir}/meka
 install -d %{buildroot}/%{_datadir}/meka
 install -m 644 meka.{blt,dat,inp,msg,nam,pat,thm} %{buildroot}/%{_datadir}/meka
-install -d %{buildroot}/%{_datadir}/meka/datafiles
-install -m 644 datafiles/* %{buildroot}/%{_datadir}/meka/datafiles
-install -d %{buildroot}/%{_datadir}/meka/Themes
-install -m 644 Themes/* %{buildroot}/%{_datadir}/meka/Themes
+cp -aR {Data,Themes} %{buildroot}/%{_datadir}/meka
 
 # install desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -100,6 +99,11 @@ convert -delete 1 srcs/mekaw.ico \
 convert -delete 0 srcs/mekaw.ico \
   %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
+# symlink system fonts
+rm %{buildroot}%{_datadir}/%{name}/Data/fonts/ProggyTinySZ.ttf
+ln -s %{_datadir}/fonts/grimmer-proggy-tinysz/ProggyTinySZ.ttf \
+    %{buildroot}%{_datadir}/%{name}/Data/fonts/ProggyTinySZ.ttf
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -123,11 +127,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%doc changes.txt compat.txt debugger.txt history.txt meka.txt multi.txt 
+%doc changes.txt compat.txt debugger.txt history.txt meka.txt multi.txt
 %doc sources.txt tech.txt TODO.txt
 
 
 %changelog
+* Thu Jun 02 2016 Andrea Musuruane <musuruan at gmail.com> - 0.80-0.8.20150506git
+- Updated to a new upstream preview of version 0.80
+- Using new upstream repository
+
 * Sun Oct 05 2014 Andrea Musuruane <musuruan at gmail.com> - 0.80-0.7.20141005svn
 - Updated to a new upstream preview of version 0.80
 - Made a patch to fix format strings
diff --git a/sources b/sources
index b8ff5da..ee79fcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee9171bb0d19aeb90ca14626dc436e6d  meka-2014-10-05-srcs.zip
+05ea5c29d1d01ab93b0adbd29d509fad  meka-0.80-f55fcdd.tar.gz
