rpms/hatari/FC-6 hatari-0.95-hmsa_rpmopt.patch, NONE, 1.1 hatari-README.tos, NONE, 1.1 hatari.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 hatari.spec, 1.2, 1.3 sources, 1.2, 1.3

Sat Jun 23 15:36:49 UTC 2007

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5777

Modified Files:
	.cvsignore hatari.spec sources 
Added Files:
	hatari-0.95-hmsa_rpmopt.patch hatari-README.tos hatari.desktop 
Log Message:
Update to upstrem 0.95

hatari-0.95-hmsa_rpmopt.patch:

--- NEW FILE hatari-0.95-hmsa_rpmopt.patch ---
diff -dur hatari-0.95.orig/tools/hmsa/Makefile hatari-0.95/tools/hmsa/Makefile
--- hatari-0.95.orig/tools/hmsa/Makefile	2007-02-02 01:06:11.000000000 +0100
+++ hatari-0.95/tools/hmsa/Makefile	2007-05-26 12:36:04.000000000 +0200
@@ -4,7 +4,7 @@
 HATARI_OBJS = msa.o dim.o st.o file.o unzip.o zip.o
 OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
 
-CFLAGS = -g -O -Wall -I../../src/includes \
+CFLAGS += -I../../src/includes \
 	$(shell sdl-config --cflags)
 
 LIBS = -lz


--- NEW FILE hatari-README.tos ---
To run the emulator a TOS ROM image is needed. EmuTOS, a free implementation
of TOS, is shipped with hatari.

EmuTOS is a single-user single-tasking operating system for the 32 bit Atari
computers and emulators. It can be used as a replacement for the TOS images
typically needed today for using emulators and it is also running on some
real hardware, like the Atari Mega STE. All the source code is open and
free, licensed under the GNU General Public License (GPL). A copy of the GNU
GPL can be found in the gpl.txt file.

EmuTOS has its home at sourceforge:
http://sourceforge.net/projects/emutos

Hatari is shipped with tos.img ROM image that is identical to etos256us.img
from the binary package of version 0.8.1 available at sourceforge:
http://dl.sourceforge.net/sourceforge/emutos/emutos256k-0.8.1.zip



--- NEW FILE hatari.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hatari
Comment=Atari ST emulator
Exec=hatari
Icon=hatari.png
Terminal=false
Type=Application
Categories=Game;Emulator;



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2006 16:27:48 -0000	1.2
+++ .cvsignore	23 Jun 2007 15:36:14 -0000	1.3
@@ -1 +1 @@
-hatari-0.90.tar.gz
+hatari-0.95.tar.gz


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/FC-6/hatari.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hatari.spec	17 Mar 2007 18:58:19 -0000	1.2
+++ hatari.spec	23 Jun 2007 15:36:14 -0000	1.3
@@ -1,13 +1,16 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 0.90
-Release: 6%{?dist}
+Version: 0.95
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Emulators
 URL: http://hatari.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1: hatari.png
+Source2: hatari.desktop
+Source3: hatari-README.tos
+Patch0: hatari-0.95-hmsa_rpmopt.patch
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
 BuildRequires: desktop-file-utils
@@ -15,71 +18,63 @@
 
 
 %description
-Hatari is an Atari-ST and STE emulator for Linux. More precisely, it 
-is an adaption of the WinSTon source code to Linux, using the UAE CPU
-core instead of the original, non-portable assembler CPU core. 
-
-Unlike other ST emulators which concentrate on desktop compatibility,
-it is suitable for playing games.
+Hatari is an emulator for the Atari ST, STE, TT and Falcon computers.
+More precisely, it is an adaption of the WinSTon source code to 
+Linux, using the UAE CPU core instead of the original, non-portable 
+assembler CPU core.
+
+The Atari ST was a 16/32 bit computer system which was first released 
+by Atari in 1985. Using the Motorola 68000 CPU, it was a very popular 
+computer having quite a lot of CPU power at that time.
+
+Unlike many other Atari ST emulators which try to give you a good 
+environment for running GEM applications, Hatari tries to emulate the 
+hardware of a ST as close as possible so that it is able to run most 
+of the old ST games and demos.
 
 
 %prep
 %setup -q
+%patch0 -p1
+
+cp -p %{SOURCE3} README.tos
 
-# fix Makefile not to strip binaries during make install
+# Fix Makefile not to strip binaries during make install
 sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in
 
+# Convert french man page to UTF-8
+iconv --from=ISO-8859-1 --to=UTF-8 doc/fr/hatari.1 > doc/fr/hatari.1.utf8
+mv doc/fr/hatari.1.utf8 doc/fr/hatari.1
 
 %build
 %configure --datadir=%{_datadir}/hatari
-make
-
-# README.tos
-cat >doc/README.tos <<EOF
-To run the emulator a TOS ROM image is needed. EmuTOS, a free implementation 
-of TOS, is shipped with hatari. 
-
-EmuTOS is a single-user single-tasking operating system for the 32 bit Atari
-computers and emulators. It can be used as a replacement for the TOS images
-typically needed today for using emulators and it is also running on some
-real hardware, like the Atari Mega STE. All the source code is open and
-free, licensed under the GNU General Public License (GPL). A copy of the GNU 
-GPL can be found in the gpl.txt file.
-
-EmuTOS has its home at sourceforge:
-http://sourceforge.net/projects/emutos
-
-Hatari is shipped with tos.img ROM image that is identical to etos256us.img 
-from the binary package of version 0.8.1 available at sourceforge:
-http://dl.sourceforge.net/sourceforge/emutos/emutos256k-0.8.1.zip
-EOF
-
-# Build desktop icon
-cat >%{name}.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=Hatari
-Comment=Atari ST emulator
-Exec=%{name}
-Icon=%{name}.png
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-Version=%{version}
-EOF
+# It does not compile with smp_mflags
+make 
 
+# Build hmsa tool
+make -C tools/hmsa
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} 
+
+# Install hmsa tool
+install -d -m 755 %{buildroot}%{_bindir}
+install -m 755 tools/hmsa/hmsa %{buildroot}%{_bindir}
+
+# Install man pages
 install -d -m 755 %{buildroot}%{_mandir}/man1
 install -m 644 doc/hatari.1 %{buildroot}%{_mandir}/man1
+install -d -m 755 %{buildroot}%{_mandir}/fr/man1
+install -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
 
-# install desktop file and icon
+# Install desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  %{name}.desktop
+  %{SOURCE2}
+
+# Install icon
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
@@ -89,31 +84,39 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
+%{_bindir}/hmsa
 %{_datadir}/hatari
 %{_mandir}/man1/hatari.1*
+%{_mandir}/fr/man1/hatari.1*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %doc gpl.txt readme.txt doc/{*.txt,*.html,images}
-%doc doc/README.tos
+%doc tools/hmsa/readme-hmsa.txt
+%doc README.tos
 
 
 %changelog
+* Sat Jun 23 2007 Andrea Musuruane <musuruan at gmail.com> 0.95-1%{?dist}
+- updated to upstream 0.95
+- updated description
+- README.tos and hatari.desktop are no longer built in the spec file
+- added new upstream hmsa tool
+- added new upstream french man page
+- updated icon cache scriptlets to be compliant to new guidelines
+- cosmetic changes
+
 * Sat Mar 17 2007 Andrea Musuruane <musuruan at gmail.com> 0.90-6%{?dist}
 - dropped --add-category X-Fedora from desktop-file-install
 - changed .desktop category to Game;Emulator;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2006 16:27:48 -0000	1.2
+++ sources	23 Jun 2007 15:36:14 -0000	1.3
@@ -1 +1 @@
-2e5d1e329ebbf6c75ccab8c4f9a78f11  hatari-0.90.tar.gz
+5f1ca3f29e74654bf12e8afd42bb7d0a  hatari-0.95.tar.gz


