rpms/desmume/devel desmume-0.7.0-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.7.0-nobuggytoolsmenu.patch, NONE, 1.1 desmume.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Jul 14 16:06:40 CEST 2008

Author: musuruan

Update of /cvs/free/rpms/desmume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14865/devel

Modified Files:
	.cvsignore sources 
Added Files:
	desmume-0.7.0-dontlookinbuilddir.patch 
	desmume-0.7.0-nobuggytoolsmenu.patch desmume.spec 
Log Message:
First Import


desmume-0.7.0-dontlookinbuilddir.patch:

--- NEW FILE desmume-0.7.0-dontlookinbuilddir.patch ---
--- desmume-0.7.0/src/gtk-glade/main.c.orig	2007-04-21 20:45:07.000000000 +0100
+++ desmume-0.7.0/src/gtk-glade/main.c	2007-06-01 13:48:22.000000000 +0100
@@ -77,11 +77,6 @@
 {
 	char *path;
 
-	/* looking in uninstalled (aka building) dir first */
-	path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL);
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
-	g_free (path);
-	
 	/* looking in installed dir */
 	path = g_build_filename (DATADIR, filename, NULL);
 	if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;

desmume-0.7.0-nobuggytoolsmenu.patch:

--- NEW FILE desmume-0.7.0-nobuggytoolsmenu.patch ---
--- desmume-0.7.0/src/gtk/main.c.orig	2007-04-21 15:27:07.000000000 +0100
+++ desmume-0.7.0/src/gtk/main.c	2007-06-01 14:27:09.000000000 +0100
@@ -1633,21 +1633,6 @@
 	
 #endif
 	
-	/** Menu "Outils" **/
-	
-	pMenu = gtk_menu_new();
-	
-	for(i = 0; i < dTools_list_size; i++)
-	{
-		pMenuItem = gtk_menu_item_new_with_label(dTools_list[i]->name);
-		g_signal_connect(G_OBJECT(pMenuItem), "activate", G_CALLBACK(Start_dTool), GINT_TO_POINTER(i));
-		gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), pMenuItem);
-	}
-		
-	pMenuItem = gtk_menu_item_new_with_label("Tools");
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(pMenuItem), pMenu);
-	gtk_menu_shell_append(GTK_MENU_SHELL(pMenuBar), pMenuItem);
-	
 	/** Menu "?" **/
 
 	pMenu = gtk_menu_new();


--- NEW FILE desmume.spec ---
Name: desmume
Version: 0.8
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: desmume-0.7.0-dontlookinbuilddir.patch
Patch1: desmume-0.7.0-nobuggytoolsmenu.patch
# The following files were not found in the official 0.7.3 release
#Patch2: desmume-0.7.3-debian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtkglext-devel
BuildRequires: libglade2-devel
BuildRequires: zziplib-devel 
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme


%package glade
Summary: A Nintendo DS emulator (Glade GUI version)
Group: Applications/Emulators

%package cli
Summary: A Nintendo DS emulator (CLI version)
Group: Applications/Emulators


%description
DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games.

%description glade
DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games.

This is the GTK/Glade version.

%description cli
DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games.

This is the CLI version.


%prep
%setup -q
%setup -q -T -D -a 1

%patch0 -p1
%ifarch x86_64
%patch1 -p1
%endif
#%patch2 -p1

# Fix premissions
chmod 644 src/*.{c,h}
chmod 644 src/gtk-glade/*.{c,h}
chmod 644 src/gtk-glade/dTools/*.{c,h}

# Fix glade path
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.in

# Fix gettext package name
sed -i 's|GETTEXT_PACKAGE=desmume|GETTEXT_PACKAGE=desmume-glade|g' configure{,.ac}


%build
%configure
make %{?_smp_mflags}


%install
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/

# Rename desktop files and fix categories
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
  --delete-original \
  --vendor dribble \
  --remove-key Version \
  --remove-category GNOME \
  --remove-category GTK \
  --remove-category Application \
  --add-category Emulator \
  --dir %{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

desktop-file-install \
  --delete-original \
  --vendor dribble \
  --remove-key Version \
  --remove-category GNOME \
  --remove-category GTK \
  --remove-category Application \
  --add-category Emulator \
  --dir %{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/%{name}-glade.desktop

%find_lang %{name}-glade


%clean
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


%post glade
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun glade
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/32x32/apps/DeSmuME.xpm
%{_datadir}/applications/dribble-%{name}.desktop
%{_mandir}/man1/%{name}.1*
%doc AUTHORS ChangeLog COPYING README README.LIN


%files glade -f %{name}-glade.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}-glade
%{_datadir}/%{name}-glade
%{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm
%{_datadir}/applications/dribble-%{name}-glade.desktop
%{_mandir}/man1/%{name}-glade.1*
%doc AUTHORS ChangeLog COPYING README README.LIN


%files cli
%defattr(-,root,root,-)
%{_bindir}/%{name}-cli
%{_mandir}/man1/%{name}-cli.1*
%doc AUTHORS ChangeLog COPYING README README.LIN


%changelog
* Wed Apr 23 2008 Andrea Musuruane <musuruan at gmail.com> 0.8-1
- Updated to upstream version 0.8

* Sun Sep 08 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-4
- Using debian sources because many things were missing from upstream
- Removed no longer needed automake and autoconf from BR
- Updated icon cache scriptlets to be compliant to new guidelines

* Tue Aug 21 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-3
- Added missing automake libtool to BR

* Mon Aug 20 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-2
- Added missing autoconf to BR

* Sat Aug 18 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-1
- Updated to upstream version 0.7.3
- Added man pages from Debian
- Updated License tag from GPL to GPLv2+
- Removed %%{?dist} tag from changelog

* Sun Jun 24 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.1-1
- Updated to upstream version 0.7.1
- Updated icon cache scriptlets to be compliant to new guidelines

* Thu Jun 07 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.0-2
- Added a patch from Ian Chapman to remove the buggy tools menu which 
  only contains IO regs which frequently crashes desmume on x86_64
- Added a patch from Ian Chapman to make desmume-glade ONLY look in the 
  installed location for it's .glade files and not to use the "uninstalled" 
  location
- Shortened description
- Better use of %%{name} macro

* Fri May 25 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.0-1
- Updated to upstrem version 0.7.0

* Sun Mar 25 2007 Andrea Musuruane <musuruan at gmail.com> 0.6.0-1
- Initial release for Dribble



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2008 11:14:30 -0000	1.1
+++ .cvsignore	14 Jul 2008 14:06:39 -0000	1.2
@@ -0,0 +1,2 @@
+desmume-0.8.tar.gz
+desmume-man-pages-0.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jun 2008 11:14:30 -0000	1.1
+++ sources	14 Jul 2008 14:06:39 -0000	1.2
@@ -0,0 +1,2 @@
+d8bf49dfd8d571af3a16be105c70dfda  desmume-0.8.tar.gz
+64cb8e6288b7490f097e20fb262f0e97  desmume-man-pages-0.7.3.tar.gz

