rpms/desmume/F-10 .cvsignore, 1.5, 1.6 desmume.spec, 1.7, 1.8 sources, 1.5, 1.6 desmume-0.9.2-64bit.patch, 1.1, NONE desmume-0.9.2-fix-ioregs-crash.patch, 1.1, NONE

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/desmume/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30320

Modified Files:
	.cvsignore desmume.spec sources 
Removed Files:
	desmume-0.9.2-64bit.patch desmume-0.9.2-fix-ioregs-crash.patch 
Log Message:
* Fri Jul 24 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.4-1
- Updated to upstream version 0.9.4
- Added a fix to compile under gcc 4.4 (SF #2819176)
- Removed no longer needed patches
- Removed no longer needed Debian man pages
- Cosmetic changes



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Apr 2009 10:04:26 -0000	1.5
+++ .cvsignore	24 Jul 2009 17:08:32 -0000	1.6
@@ -1,2 +1 @@
-desmume-0.9.2.tar.gz
-desmume-man-pages-0.7.3.tar.gz
+desmume-0.9.4.tar.gz


Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/desmume.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- desmume.spec	30 Apr 2009 19:20:45 -0000	1.7
+++ desmume.spec	24 Jul 2009 17:08:32 -0000	1.8
@@ -1,20 +1,13 @@
 Name: desmume
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
 Summary: A Nintendo DS emulator
 
 Group: Applications/Emulators
 License: GPLv2+
 URL: http://desmume.org/
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1: desmume-man-pages-0.7.3.tar.gz
 Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fix IO Regs menu
-# http://sourceforge.net/tracker/?func=detail&atid=832291&aid=2781065&group_id=164579
-Patch1: %{name}-0.9.2-fix-ioregs-crash.patch
-# Compile on 64 bit systems
-# http://sourceforge.net/tracker/?func=detail&aid=2755952&group_id=164579&atid=832291
-Patch2: %{name}-0.9.2-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtkglext-devel
@@ -51,14 +44,13 @@
 
 %prep
 %setup -q
-%setup -q -T -D -a 1
-
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
+
+# Fix to compile under gcc 4.4
+sed -i "s/TexCache_TexFormat format/TexCache_TexFormat/" src/texcache.h 
 
 # Fix end-of-line encoding
-sed -i 's/\r//' ChangeLog AUTHORS
+sed -i 's/\r//' AUTHORS
 
 # Fix file encoding
 for txtfile in ChangeLog AUTHORS
@@ -77,7 +69,6 @@
 sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in}
 
 # We need a different icon for desmume-glade
-cp -a src/gtk/DeSmuME.xpm src/gtk-glade/DeSmuME-glade.xpm
 sed -i 's|Icon=DeSmuME.xpm|Icon=DeSmuME-glade.xpm|g' src/gtk-glade/desmume-glade.desktop
 
 # Fix gettext package name
@@ -93,19 +84,13 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-# Install man pages
-mkdir -p %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}.1 %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}-glade.1 %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}-cli.1 %{buildroot}%{_mandir}/man1/
-
 # Remove installed icon
 rm %{buildroot}%{_datadir}/pixmaps/DeSmuME.xpm
 
 # Install icons
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 install -m 644 src/gtk/DeSmuME.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m 644 src/gtk-glade/DeSmuME-glade.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+install -m 644 src/gtk/DeSmuME.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm
 
 # Rename desktop files and fix categories
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -189,6 +174,13 @@
 
 
 %changelog
+* Fri Jul 24 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.4-1
+- Updated to upstream version 0.9.4
+- Added a fix to compile under gcc 4.4 (SF #2819176)
+- Removed no longer needed patches
+- Removed no longer needed Debian man pages
+- Cosmetic changes
+
 * Thu Apr 30 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-2
 - Added a patch from upstream to fix IO Regs menu crash (SF #2781065)
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2009 10:04:26 -0000	1.5
+++ sources	24 Jul 2009 17:08:32 -0000	1.6
@@ -1,2 +1 @@
-51482de785dce04590532b946321196d  desmume-0.9.2.tar.gz
-64cb8e6288b7490f097e20fb262f0e97  desmume-man-pages-0.7.3.tar.gz
+0e877fe4b99d99502173efa6efae05b1  desmume-0.9.4.tar.gz


--- desmume-0.9.2-64bit.patch DELETED ---


--- desmume-0.9.2-fix-ioregs-crash.patch DELETED ---