rpms/hatari/devel .cvsignore, 1.7, 1.8 hatari.spec, 1.14, 1.15 sources, 1.7, 1.8 hatari.png, 1.1, NONE
musuruan
musuruan at fedoraproject.org
Sun Aug 23 12:26:59 UTC 2009
Author: musuruan
Update of /cvs/pkgs/rpms/hatari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26584
Modified Files:
.cvsignore hatari.spec sources
Removed Files:
hatari.png
Log Message:
* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
- updated to upstream 1.3.0
- disabled new upstream python UI
- updated icon cache snippets
- used upstream Mac OS X icons
- preserved french man page timestamp
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 25 Jan 2009 15:30:10 -0000 1.7
+++ .cvsignore 23 Aug 2009 12:26:58 -0000 1.8
@@ -1 +1 @@
-hatari-1.2.0.tar.bz2
+hatari-1.3.0.tar.bz2
Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/hatari.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hatari.spec 10 Aug 2009 20:25:39 -0000 1.14
+++ hatari.spec 23 Aug 2009 12:26:58 -0000 1.15
@@ -1,17 +1,17 @@
Summary: An Atari ST emulator suitable for playing games
Name: hatari
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?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.png
-Source2: hatari.desktop
-Source3: hatari-README.tos
+Source1: hatari.desktop
+Source2: hatari-README.tos
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: zlib-devel
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -35,42 +35,44 @@ of the old ST games and demos.
%prep
%setup -q
-cp -p %{SOURCE3} README.tos
+cp -p %{SOURCE2} README.tos
# Fix Makefile not to strip binaries during make install
sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in
+# Do not install python UI
+sed -i 's|$(MAKE) -C python-ui/ install||' Makefile
+
%build
%configure --datadir=%{_datadir}/hatari
# 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 French man page
install -d -m 755 %{buildroot}%{_mandir}/fr/man1
-install -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
+install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
# Install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
- %{SOURCE2}
+ %{SOURCE1}
+
+# Extract Mac OS X icons
+icns2png -x src/gui-osx/Hatari.icns
-# Install icon
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+# Install icons
+for i in 16 32 48 128; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 Hatari_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png
+done
# Remove installed doc files
rm -rf %{buildroot}%{_docdir}/%{name}
@@ -81,19 +83,20 @@ rm -rf %{buildroot}
%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 &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+
+
%files
%defattr(-,root,root)
%{_bindir}/hatari
@@ -103,13 +106,20 @@ fi
%{_mandir}/man1/hatari.1*
%{_mandir}/fr/man1/hatari.1*
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%doc gpl.txt readme.txt doc/{*.txt,*.html,images}
%doc tools/hmsa/readme-hmsa.txt
%doc README.tos
%changelog
+* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
+- updated to upstream 1.3.0
+- disabled new upstream python UI
+- updated icon cache snippets
+- used upstream Mac OS X icons
+- preserved french man page timestamp
+
* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
- updated Source0 URL
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 25 Jan 2009 15:30:10 -0000 1.7
+++ sources 23 Aug 2009 12:26:58 -0000 1.8
@@ -1 +1 @@
-4aecd42784fae8c5e8c9a9a341146fbb hatari-1.2.0.tar.bz2
+1440230be3dd38098f4e0ef36b0a90df hatari-1.3.0.tar.bz2
More information about the fedora-extras-commits
mailing list