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

[lisu]

Author: lisu                         Date: Tue Sep  8 11:22:18 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.1
- destdir.patch no longer needed

---- Files affected:
packages/hatari:
   hatari-destdir.patch (1.1 -> 1.2) , hatari-useless_files.patch (1.3 -> 1.4) , hatari.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/hatari/hatari-destdir.patch
diff -u packages/hatari/hatari-destdir.patch:1.1 packages/hatari/hatari-destdir.patch:1.2
--- packages/hatari/hatari-destdir.patch:1.1	Mon Aug 17 11:35:53 2009
+++ packages/hatari/hatari-destdir.patch	Tue Sep  8 13:22:12 2009
@@ -1,9 +1,9 @@
---- hatari-1.3.0/python-ui/Makefile~	2009-08-16 21:44:20.000000000 +0200
-+++ hatari-1.3.0/python-ui/Makefile	2009-08-17 11:08:51.000000000 +0200
-@@ -12,8 +12,8 @@
- BINPATH  = $(DESTDIR)$(BINDIR)
- SCRIPT   = $(BINPATH)/hatariui
- DATAPATH = $(DESTDIR)$(DATADIR)/hatariui
+--- hatari-1.3.1/python-ui/Makefile~	2009-09-08 12:35:31.000000000 +0200
++++ hatari-1.3.1/python-ui/Makefile	2009-09-08 12:36:43.000000000 +0200
+@@ -11,8 +11,8 @@
+ 
+ SCRIPT   = $(BINDIR)/hatariui
+ DATAPATH = $(DATADIR)/hatariui
 -ICONPATH = $(prefix)/share/icons/hicolor/32x32/apps
 -DESKPATH = $(prefix)/share/applications
 +ICONPATH = $(DESTDIR)$(prefix)/share/icons/hicolor/32x32/apps

================================================================
Index: packages/hatari/hatari-useless_files.patch
diff -u packages/hatari/hatari-useless_files.patch:1.3 packages/hatari/hatari-useless_files.patch:1.4
--- packages/hatari/hatari-useless_files.patch:1.3	Mon Aug 17 11:35:20 2009
+++ packages/hatari/hatari-useless_files.patch	Tue Sep  8 13:22:12 2009
@@ -1,5 +1,5 @@
---- hatari-1.3.0/Makefile~	2009-08-16 21:44:19.000000000 +0200
-+++ hatari-1.3.0/Makefile	2009-08-17 10:50:33.000000000 +0200
+--- 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)
@@ -16,14 +16,14 @@
 -	$(INSTALL_DATA) doc/*.txt doc/*.html $(DESTDIR)$(DOCDIR)/
 -	$(INSTALL_DATA) doc/images/*.png $(DESTDIR)$(DOCDIR)/images/
  	$(MAKE) -C python-ui/ install
---- hatari-1.3.0/python-ui/Makefile~	2009-08-16 21:44:20.000000000 +0200
-+++ hatari-1.3.0/python-ui/Makefile	2009-08-17 11:19:50.000000000 +0200
-@@ -26,7 +26,7 @@
- 	$(INSTALL) -d $(DATAPATH)
- 	$(INSTALL_SCRIPT) hatariui.py debugui.py $(DATAPATH)/
- 	$(INSTALL_DATA) config.py dialogs.py hatari.py uihelpers.py $(DATAPATH)/
--	$(INSTALL_DATA) README TODO Changelog *.png $(DATAPATH)/
-+	$(INSTALL_DATA) *.png $(DATAPATH)/
- 	$(INSTALL) -d $(ICONPATH)
- 	$(INSTALL_DATA) hatari-icon.png $(ICONPATH)/
- 	$(INSTALL) -d $(DESKPATH)
+--- 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)

================================================================
Index: packages/hatari/hatari.spec
diff -u packages/hatari/hatari.spec:1.18 packages/hatari/hatari.spec:1.19
--- packages/hatari/hatari.spec:1.18	Mon Aug 17 13:12:04 2009
+++ packages/hatari/hatari.spec	Tue Sep  8 13:22:12 2009
@@ -2,16 +2,15 @@
 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.0
+Version:	1.3.1
 Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://download.berlios.de/hatari/%{name}-%{version}.tar.bz2
-# Source0-md5:	1440230be3dd38098f4e0ef36b0a90df
+# Source0-md5:	112b544ec4affb7c04e931088e62a115
 Patch0:		%{name}-useless_files.patch
-Patch1:		%{name}-destdir.patch
-Patch2:		%{name}-python_init.patch
-Patch3:		%{name}-desktop.patch
+Patch1:		%{name}-python_init.patch
+Patch2:		%{name}-desktop.patch
 URL:		http://hatari.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
 BuildRequires:	autoconf
@@ -41,7 +40,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %{__sed} -i 's#path=$(DATAPATH)#path=%{_datadir}/hatari/hatariui#' python-ui/Makefile
 
 %build
@@ -80,6 +78,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/09/08 11:22:12  lisu
+- up to 1.3.1
+- destdir.patch no longer needed
+
 Revision 1.18  2009/08/17 11:12:04  lisu
 - icon, desktop
 
================================================================

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