From 71540fa6fd861452d9c3fd8c840ac88cac93144c Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Nov 14 2010 17:45:09 +0000 Subject: - added license among docs --- diff --git a/.gitignore b/.gitignore index 4aaf459..0b09cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ hatari-1.3.1.tar.bz2 +/hatari-1.4.0.tar.bz2 diff --git a/hatari-1.4.0-debian-manpages.tar.gz b/hatari-1.4.0-debian-manpages.tar.gz new file mode 100644 index 0000000..bef89d6 Binary files /dev/null and b/hatari-1.4.0-debian-manpages.tar.gz differ diff --git a/hatari-README.tos b/hatari-README.tos deleted file mode 100644 index 64a9ec2..0000000 --- a/hatari-README.tos +++ /dev/null @@ -1,17 +0,0 @@ -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 - diff --git a/hatari.spec b/hatari.spec index cdd6d73..f68b6b6 100644 --- a/hatari.spec +++ b/hatari.spec @@ -1,19 +1,37 @@ Summary: An Atari ST emulator suitable for playing games Name: hatari -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.4.0 +Release: 4%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://hatari.berlios.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2 -Source1: hatari.desktop -Source2: hatari-README.tos +Source1: hatari-1.4.0-debian-manpages.tar.gz +Source2: hatari.desktop +BuildRequires: cmake BuildRequires: SDL-devel >= 1.2.0 BuildRequires: zlib-devel +BuildRequires: libpng-devel +BuildRequires: readline-devel +BuildRequires: portaudio-devel +BuildRequires: python2-devel BuildRequires: libicns-utils BuildRequires: desktop-file-utils Requires: hicolor-icon-theme +# Required by zip2st and atari-hd-image +Requires: unzip +Requires: mtools +Requires: dosfstools + + +%package ui +Summary: External user interface for Hatari +Group: Applications/Emulators +Requires: %{name} = %{version}-%{release} +Requires: python2 +Requires: pygtk2 +Requires: hicolor-icon-theme %description @@ -32,26 +50,27 @@ 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 +%description ui -cp -p %{SOURCE2} README.tos +Hatari UI is an out-of-process user interface for the Hatari emulator and its +built-in debugger which can (optionally) embed the Hatari emulator window. -# Fix Makefile not to strip binaries during make install -sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in -# Dirty hack to link against libm -# It won't be needed in the next upstream version because they now use CMake -sed -i 's/LIBS = @LIBS@ @X_LIBS@/LIBS = @LIBS@ @X_LIBS@ -lm/' Makefile.cnf.in +%prep +%setup -q +%setup -D -T -q -a 1 -# Do not install python UI -sed -i 's|$(MAKE) -C python-ui/ install||' Makefile +# Fix hataiui to get doc files +sed -i 's/"hatari" + sep/"%{name}-%{version}" + sep/' python-ui/uihelpers.py %build -%configure --datadir=%{_datadir}/hatari +%cmake \ + -DCMAKE_BUILD_TYPE:STRING=None \ + -DDOCDIR:PATH=%{_docdir}/%{name}-%{version} \ + -DBUILD_SHARED_LIBS:BOOL=OFF . # It does not compile with smp_mflags -make +make VERBOSE=1 %install @@ -62,11 +81,15 @@ make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_mandir}/fr/man1 install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1 +# Install man pages from Debian +install -d -m 755 %{buildroot}%{_mandir}/man1 +install -p -m 644 debian-manpages/* %{buildroot}%{_mandir}/man1 + # Install desktop file install -d -m 755 %{buildroot}%{_datadir}/applications desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE1} + %{SOURCE2} # Extract Mac OS X icons icns2png -x src/gui-osx/Hatari.icns @@ -78,8 +101,25 @@ for i in 16 32 48 128; do %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png done -# Remove installed doc files -rm -rf %{buildroot}%{_docdir}/%{name} +# Install hatari-ui desktop file +desktop-file-install \ + --delete-original \ + --remove-key Encoding \ + --add-category Game \ + --add-category Emulator \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/hatariui.desktop + +# Remove script extensions from scripts installed in /usr/bin +mv %{buildroot}%{_bindir}/atari-hd-image.sh \ + %{buildroot}%{_bindir}/atari-hd-image +mv %{buildroot}%{_bindir}/zip2st.sh \ + %{buildroot}%{_bindir}/zip2st +mv %{buildroot}%{_bindir}/hatari-console.py \ + %{buildroot}%{_bindir}/hatari-console + +# Install license among docs +install -p -m 644 gpl.txt %{buildroot}%{_docdir}/%{name}-%{version} %clean @@ -90,6 +130,10 @@ rm -rf %{buildroot} touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%post ui +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + %postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -97,26 +141,71 @@ if [ $1 -eq 0 ] ; then fi +%postun ui +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%posttrans ui +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root) %{_bindir}/hatari %{_bindir}/zip2st +%{_bindir}/atari-hd-image %{_bindir}/hmsa -%{_datadir}/hatari +%{_datadir}/%{name} %{_mandir}/man1/hatari.1* %{_mandir}/fr/man1/hatari.1* +%{_mandir}/man1/atari-hd-image.1* +%{_mandir}/man1/hmsa.1* +%{_mandir}/man1/zip2st.1* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%doc gpl.txt readme.txt doc/{*.txt,*.html,images} -%doc tools/hmsa/readme-hmsa.txt -%doc README.tos +%doc %{_docdir}/%{name}-%{version} +%exclude %{_datadir}/%{name}/hatariui + +%files ui +%defattr(-,root,root) +%{_bindir}/hatariui +%{_bindir}/hatari-console +%{_datadir}/%{name}/hatariui +%{_mandir}/man1/hatariui.1* +%{_mandir}/man1/hatari-console.1* +%{_datadir}/applications/hatariui.desktop +%{_datadir}/icons/hicolor/32x32/apps/hatari-icon.png +%doc python-ui/{README,release-notes.txt,TODO} +%exclude %{_datadir}/%{name}/hatariui/README +%exclude %{_datadir}/%{name}/hatariui/release-notes.txt +%exclude %{_datadir}/%{name}/hatariui/TODO %changelog +* Sun Nov 14 2010 Andrea Musuruane 1.4.0-4 +- added license among docs + +* Sun Nov 14 2010 Andrea Musuruane 1.4.0-3 +- ui subpackage now requires the fully versioned base package +- more consistent macro usage + +* Fri Nov 12 2010 Andrea Musuruane 1.4.0-2 +- fixed Requires +- added manpages from Debian +- removed script extensions (.sh, .py) from scripts installed into /usr/bin +- macro usage is more consistent now + +* Sun Jul 18 2010 Andrea Musuruane 1.4.0-1 +- updated to upstream 1.4.0 +- dropped README.tos now that emutos.txt is supplied + * Sat Mar 06 2010 Andrea Musuruane 1.3.1-2 - link against libm (BZ #564801) diff --git a/sources b/sources index 4eb4d5b..005379f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 112b544ec4affb7c04e931088e62a115 hatari-1.3.1.tar.bz2 +2f30e5c9e146ee92e3f2f5ae1cef3673 hatari-1.4.0.tar.bz2