packages: hatari/hatari-desktop.patch, hatari/hatari-useless_files.patch, h...

lisu lisu at pld-linux.org
Mon Jun 14 15:25:26 CEST 2010 

Author: lisu                         Date: Mon Jun 14 13:25:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.0
- switch to cmake build system (TODO)
- patches updated

---- Files affected:
packages/hatari:
   hatari-desktop.patch (1.1 -> 1.2) , hatari-useless_files.patch (1.4 -> 1.5) , hatari.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/hatari/hatari-desktop.patch
diff -u packages/hatari/hatari-desktop.patch:1.1 packages/hatari/hatari-desktop.patch:1.2
--- packages/hatari/hatari-desktop.patch:1.1	Mon Aug 17 13:12:19 2009
+++ packages/hatari/hatari-desktop.patch	Mon Jun 14 15:25:20 2010
@@ -8,5 +8,5 @@
  Name=Hatari UI
  Exec=hatariui
  Icon=hatari-icon
-+Categories=Application;Game;
++Categories=Utility;Emulator;
 +# vi: encoding=utf-8

================================================================
Index: packages/hatari/hatari-useless_files.patch
diff -u packages/hatari/hatari-useless_files.patch:1.4 packages/hatari/hatari-useless_files.patch:1.5
--- packages/hatari/hatari-useless_files.patch:1.4	Tue Sep  8 13:22:12 2009
+++ packages/hatari/hatari-useless_files.patch	Mon Jun 14 15:25:20 2010
@@ -1,29 +1,21 @@
---- hatari-1.3.1/Makefile~	2009-09-05 00:52:41.000000000 +0200
-+++ hatari-1.3.1/Makefile	2009-09-08 12:33:20.000000000 +0200
-@@ -61,8 +61,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/images
- 	$(INSTALL_PROGRAM) src/hatari $(DESTDIR)$(BINDIR)/hatari
- 	$(INSTALL_PROGRAM) tools/hmsa/hmsa $(DESTDIR)$(BINDIR)/hmsa
- 	$(INSTALL_SCRIPT) tools/zip2st.sh $(DESTDIR)$(BINDIR)/zip2st
-@@ -71,6 +69,4 @@
- 	  $(INSTALL_DATA) src/tos.img $(DESTDIR)$(DATADIR)/tos.img ; \
- 	fi
- 	$(INSTALL_DATA) hatari.1.gz $(DESTDIR)$(MANDIR)/
--	$(INSTALL_DATA) doc/*.txt doc/*.html $(DESTDIR)$(DOCDIR)/
--	$(INSTALL_DATA) doc/images/*.png $(DESTDIR)$(DOCDIR)/images/
- 	$(MAKE) -C python-ui/ install
---- hatari-1.3.1/python-ui/Makefile~	2009-09-08 12:32:43.000000000 +0200
-+++ hatari-1.3.1/python-ui/Makefile	2009-09-08 12:34:19.000000000 +0200
-@@ -25,7 +25,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(DATAPATH)
- 	$(INSTALL_SCRIPT) hatariui.py debugui.py $(DESTDIR)$(DATAPATH)/
- 	$(INSTALL_DATA) config.py dialogs.py hatari.py uihelpers.py $(DESTDIR)$(DATAPATH)/
--	$(INSTALL_DATA) README TODO Changelog *.png $(DESTDIR)$(DATAPATH)/
-+	$(INSTALL_DATA) *.png $(DESTDIR)$(DATAPATH)/
- 	$(INSTALL) -d $(DESTDIR)$(ICONPATH)
- 	$(INSTALL_DATA) hatari-icon.png $(DESTDIR)$(ICONPATH)/
- 	$(INSTALL) -d $(DESTDIR)$(DESKPATH)
+--- 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 @@
+ 	set(MANDIR share/man/man1)
+ endif()
+ 
+-if(NOT DOCDIR)
+-	set(DOCDIR share/doc/hatari)
+-endif()
+-
+ # #########################################
+ # Create config.h and recurse into subdirs:
+ # #########################################
+@@ -192,7 +188,6 @@
+ 		${CMAKE_BINARY_DIR}/config.h)
+ 
+ add_subdirectory(src)
+-add_subdirectory(doc)
+ add_subdirectory(tools)
+ 
+ include(FindPythonInterp)

================================================================
Index: packages/hatari/hatari.spec
diff -u packages/hatari/hatari.spec:1.19 packages/hatari/hatari.spec:1.20
--- packages/hatari/hatari.spec:1.19	Tue Sep  8 13:22:12 2009
+++ packages/hatari/hatari.spec	Mon Jun 14 15:25:20 2010
@@ -1,20 +1,22 @@
 # $Revision$, $Date$
+#
+# TODO: try to pass our CFLAGS and LDFLAGS
+#
 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.3.1
+Version:	1.4.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://download.berlios.de/hatari/%{name}-%{version}.tar.bz2
-# Source0-md5:	112b544ec4affb7c04e931088e62a115
+# Source0-md5:	2f30e5c9e146ee92e3f2f5ae1cef3673
 Patch0:		%{name}-useless_files.patch
 Patch1:		%{name}-python_init.patch
 Patch2:		%{name}-desktop.patch
 URL:		http://hatari.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	cmake
 BuildRequires:	libpng-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
@@ -32,31 +34,34 @@
 
 %description -l pl.UTF-8
 Hatari jest emulatorem Atari ST i STE dla Linuksa i innych systemów
-obsługiwanych przez bibliotekę SDL. Hatari emuluje większość
-sprzętu Atari ST i STE.
+obsługiwanych przez bibliotekę SDL. Hatari emuluje większość sprzętu
+Atari ST i STE.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%{__sed} -i 's#path=$(DATAPATH)#path=%{_datadir}/hatari/hatariui#' python-ui/Makefile
 
 %build
-%{__aclocal}
-%{__autoconf}
-%configure \
-	--datadir=%{_datadir}/%{name}
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64
+%endif
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/{,fr}/man1}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install doc/hatari.1	$RPM_BUILD_ROOT%{_mandir}/man1/hatari.1
 install doc/fr/hatari.1	$RPM_BUILD_ROOT%{_mandir}/fr/man1
 
 %clean
@@ -64,10 +69,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc readme.txt doc/*.txt python-ui/{Changelog,README,TODO}
+%doc readme.txt doc/*.txt python-ui/{README,TODO}
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
-%{_mandir}/man1/hatari.1*
+%{_mandir}/man1/hatari*.1*
 %lang(fr) %{_mandir}/fr/man1/hatari.1*
 %{_desktopdir}/hatariui.desktop
 %{_iconsdir}/hicolor/32x32/apps/hatari-icon.png
@@ -78,6 +83,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/06/14 13:25:20  lisu
+- up to 1.4.0
+- switch to cmake build system (TODO)
+- patches updated
+
 Revision 1.19  2009/09/08 11:22:12  lisu
 - up to 1.3.1
 - destdir.patch no longer needed
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari-desktop.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.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari.spec?r1=1.19&r2=1.20&f=u

More information about the pld-cvs-commit mailing list