Author: qboosh Date: Sun Jul 24 08:21:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.5.0
- updated useless_files,python_init patches
---- Files affected:
packages/hatari:
hatari-python_init.patch (1.1 -> 1.2) , hatari-useless_files.patch (1.5 ->
1.6) , hatari.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: packages/hatari/hatari-python_init.patch
diff -u packages/hatari/hatari-python_init.patch:1.1
packages/hatari/hatari-python_init.patch:1.2
--- packages/hatari/hatari-python_init.patch:1.1 Mon Aug 17 12:56:47 2009
+++ packages/hatari/hatari-python_init.patch Sun Jul 24 10:21:44 2011
@@ -1,24 +1,33 @@
---- hatari-1.3.0/python-ui/hatariui~ 2009-08-16 21:44:20.000000000 +0200
-+++ hatari-1.3.0/python-ui/hatariui 2009-08-17 12:45:36.000000000 +0200
-@@ -4,18 +4,18 @@
+--- hatari-1.5.0/python-ui/hatariui.orig 2011-07-19 00:32:26.000000000
+0200
++++ hatari-1.5.0/python-ui/hatariui 2011-07-23 10:05:56.946083979 +0200
+@@ -6,7 +6,7 @@
+ path=${0%/*}
name=${0##*/}
+-if [ ! -e $path/$name.py ]; then
++if [ ! -e $path/$name.pyc ]; then
+ # Assume package has been relocated, try relative data directory:
+ path=${0%/*}/../share/hatari/hatariui
+ fi
+@@ -20,18 +20,18 @@
+ export HATARI_SYSTEM_CONFDIR=$conf
+
# example setup for Hatari UI
-$path/$name.py --right "about,|,run,pause,forward,|,reset,|,quit" --embed $*
-+python $path/$name.py --right "about,|,run,pause,forward,|,reset,|,quit"
--embed $*
++python $path/$name.pyc --right "about,|,run,pause,forward,|,reset,|,quit"
--embed $*
exit 0
# test setup without embedding, dupplicate toggles
-$path/$name.py --top "about,run,pause,quit" \
-+python $path/$name.py --top "about,run,pause,quit" \
++python $path/$name.pyc --top "about,run,pause,quit" \
--panel "Testpanel,pause,>,close" \
- --bottom "sound,|,pause,|,fast,|,Testpanel" \
+ --bottom "sound,|,forward,pause,|,Testpanel" \
$*
exit 0
# test setup with embedding and all available controls
-$path/$name.py --embed \
-+python $path/$name.py --embed \
++python $path/$name.pyc --embed \
--top "about,|,run,pause,|,reset,debug,|,quit" \
--left "run,pause,reset,machine,about" \
--panel
"Keys,F1=59,F2=60,F3=61,F4=62,F5=63,F6=64,F7=65,F8=66,F9=67,F10=68,>,Macro=Test,Undo=97,Help=98,Enter=114,>,close"
\
================================================================
Index: packages/hatari/hatari-useless_files.patch
diff -u packages/hatari/hatari-useless_files.patch:1.5
packages/hatari/hatari-useless_files.patch:1.6
--- packages/hatari/hatari-useless_files.patch:1.5 Mon Jun 14 15:25:20 2010
+++ packages/hatari/hatari-useless_files.patch Sun Jul 24 10:21:44 2011
@@ -1,6 +1,6 @@
---- hatari-1.4.0/CMakeLists.txt~ 2010-06-12 13:04:40.000000000 +0200
-+++ hatari-1.4.0/CMakeLists.txt 2010-06-14 15:05:28.646457915 +0200
-@@ -180,10 +180,6 @@
+--- hatari-1.5.0/CMakeLists.txt.orig 2011-07-19 00:32:26.000000000 +0200
++++ hatari-1.5.0/CMakeLists.txt 2011-07-23 09:53:31.982725700 +0200
+@@ -220,10 +220,6 @@
set(MANDIR share/man/man1)
endif()
@@ -8,10 +8,10 @@
- set(DOCDIR share/doc/hatari)
-endif()
-
- # #########################################
- # Create config.h and recurse into subdirs:
- # #########################################
-@@ -192,7 +188,6 @@
+ if(NOT ETCDIR)
+ if(WIN32)
+ set(ETCDIR .)
+@@ -241,7 +237,6 @@
${CMAKE_BINARY_DIR}/config.h)
add_subdirectory(src)
================================================================
Index: packages/hatari/hatari.spec
diff -u packages/hatari/hatari.spec:1.21 packages/hatari/hatari.spec:1.22
--- packages/hatari/hatari.spec:1.21 Sun Feb 20 14:56:27 2011
+++ packages/hatari/hatari.spec Sun Jul 24 10:21:44 2011
@@ -2,12 +2,12 @@
Summary: hatari - an Atari ST and STE emulator for Linux
Summary(pl.UTF-8): hatari - emulator Atari ST i STE dla Linuksa
Name: hatari
-Version: 1.4.0
+Version: 1.5.0
Release: 1
License: GPL v2+
Group: Applications/Emulators
Source0: http://download.berlios.de/hatari/%{name}-%{version}.tar.bz2
-# Source0-md5: 2f30e5c9e146ee92e3f2f5ae1cef3673
+# Source0-md5: 16277cff73ec3a342b87b7b7ea3932f4
Patch0: %{name}-useless_files.patch
Patch1: %{name}-python_init.patch
Patch2: %{name}-desktop.patch
@@ -16,13 +16,16 @@
BuildRequires: cmake >= 2.6
BuildRequires: libpng-devel
BuildRequires: pkgconfig
+BuildRequires: portaudio-devel
+BuildRequires: python >= 2
BuildRequires: readline-devel
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.577
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: zlib-devel
Requires: python >= 1:2.4
-Requires: python-pygtk-gtk >= 2.8
+Requires: python-pygtk-gtk >= 2:2.8
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -41,6 +44,8 @@
%patch1 -p1
%patch2 -p1
+sed -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' python-ui/*.py
tools/hconsole/*.py
+
%build
install -d build
cd build
@@ -52,27 +57,40 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/{,fr}/man1}
+install -d $RPM_BUILD_ROOT%{_mandir}/fr/man1
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
install doc/fr/hatari.1 $RPM_BUILD_ROOT%{_mandir}/fr/man1
+%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
+%py_postclean %{_datadir}/%{name}/hatariui
+
+for f in README TODO ; do
+ mv python-ui/${f} python-ui/${f}-ui
+done
+mv tools/hconsole/{release-notes.txt,release-notes-hconsole.txt}
+mv python-ui/{release-notes.txt,release-notes-ui.txt}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc readme.txt doc/*.txt python-ui/{README,TODO}
-%attr(755,root,root) %{_bindir}/atari-hd-image.sh
+%doc readme.txt
doc/{authors,changelog,emutos,keymap-sample,memory-usage,midi-linux,release-notes,todo}.txt
doc/{compatibility,manual}.html tools/hconsole/release-notes-hconsole.txt
python-ui/{README-ui,TODO-ui,release-notes-ui.txt}
+%attr(755,root,root) %{_bindir}/atari-hd-image
%attr(755,root,root) %{_bindir}/hatari
-%attr(755,root,root) %{_bindir}/hatari-console.py
%attr(755,root,root) %{_bindir}/hatariui
%attr(755,root,root) %{_bindir}/hmsa
-%attr(755,root,root) %{_bindir}/zip2st.sh
+%attr(755,root,root) %{_bindir}/zip2st
%{_datadir}/%{name}
+%{_mandir}/man1/atari-hd-image.1*
%{_mandir}/man1/hatariui.1*
+%{_mandir}/man1/hconsole.1*
+%{_mandir}/man1/hmsa.1*
+%{_mandir}/man1/zip2st.1*
%lang(fr) %{_mandir}/fr/man1/hatari.1*
%{_desktopdir}/hatariui.desktop
%{_iconsdir}/hicolor/32x32/apps/hatari-icon.png
@@ -83,6 +101,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2011/07/24 08:21:44 qboosh
+- updated to 1.5.0
+- updated useless_files,python_init patches
+
Revision 1.21 2011/02/20 13:56:27 qboosh
- cmake hacks not to override our optflags
- pass BUILD_SHARED_LIBS=OFF to override default setting from rpm-build-macros
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari-python_init.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari-useless_files.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari.spec?r1=1.21&r2=1.22&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
