Author: musuruan Update of /cvs/free/rpms/desmume/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv31878 Modified Files: .cvsignore desmume.spec sources Added Files: desmume-0.9-dontlookinbuilddir.patch desmume-0.9-nobuggytoolsmenu.patch Removed Files: desmume-0.7.0-dontlookinbuilddir.patch desmume-0.7.0-nobuggytoolsmenu.patch Log Message: * Sun Jan 04 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.9-1 - Updated to upstream version 0.9 desmume-0.9-dontlookinbuilddir.patch: --- NEW FILE desmume-0.9-dontlookinbuilddir.patch --- diff -durN desmume-0.9.orig/src/gtk-glade/main.cpp desmume-0.9/src/gtk-glade/main.cpp --- desmume-0.9.orig/src/gtk-glade/main.cpp 2008-12-30 21:36:06.000000000 +0100 +++ desmume-0.9/src/gtk-glade/main.cpp 2009-01-04 17:30:47.000000000 +0100 @@ -239,11 +239,6 @@ { gchar *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.9-nobuggytoolsmenu.patch: --- NEW FILE desmume-0.9-nobuggytoolsmenu.patch --- diff -durN desmume-0.9.orig/src/gtk/main.cpp desmume-0.9/src/gtk/main.cpp --- desmume-0.9.orig/src/gtk/main.cpp 2008-12-30 21:35:35.000000000 +0100 +++ desmume-0.9/src/gtk/main.cpp 2009-01-04 17:35:24.000000000 +0100 @@ -1705,20 +1705,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 "Help" **/ pMenu = gtk_menu_new(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/desmume/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jul 2008 14:15:49 -0000 1.2 +++ .cvsignore 18 Jan 2009 17:52:38 -0000 1.3 @@ -1,2 +1,2 @@ -desmume-0.8.tar.gz +desmume-0.9.tar.gz desmume-man-pages-0.7.3.tar.gz Index: desmume.spec =================================================================== RCS file: /cvs/free/rpms/desmume/F-9/desmume.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- desmume.spec 30 Jul 2008 05:02:44 -0000 1.2 +++ desmume.spec 18 Jan 2009 17:52:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: desmume -Version: 0.8 -Release: 2%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: A Nintendo DS emulator Group: Applications/Emulators @@ -8,10 +8,8 @@ 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 +Patch0: %{name}-0.9-dontlookinbuilddir.patch +Patch1: %{name}-0.9-nobuggytoolsmenu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkglext-devel @@ -54,19 +52,29 @@ %ifarch x86_64 %patch1 -p1 %endif -#%patch2 -p1 + +# Fix end-of-line encoding +sed -i 's/\r//' ChangeLog AUTHORS + +# Fix file encoding +for txtfile in ChangeLog AUTHORS +do + iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp + touch -r $txtfile tmp + mv tmp $txtfile +done # Fix premissions -chmod 644 src/*.{c,h} -chmod 644 src/gtk-glade/*.{c,h} -chmod 644 src/gtk-glade/dTools/*.{c,h} +chmod 644 src/*.{cpp,h} +chmod 644 src/gtk-glade/*.{cpp,h} +chmod 644 src/gtk-glade/dTools/*.{cpp,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 +sed -i 's|Icon=DeSmuME.xpm|Icon=DeSmuME-glade.xpm|g' src/gtk-glade/desmume-glade.desktop # Fix gettext package name sed -i 's|GETTEXT_PACKAGE=desmume|GETTEXT_PACKAGE=desmume-glade|g' configure{,.ac} @@ -103,8 +111,6 @@ --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ - --remove-category Application \ - --add-category Emulator \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -114,8 +120,6 @@ --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 @@ -181,6 +185,9 @@ %changelog +* Sun Jan 04 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.9-1 +- Updated to upstream version 0.9 + * Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-2 - rebuild for buildsys cflags issue Index: sources =================================================================== RCS file: /cvs/free/rpms/desmume/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jul 2008 14:15:49 -0000 1.2 +++ sources 18 Jan 2009 17:52:38 -0000 1.3 @@ -1,2 +1,2 @@ -d8bf49dfd8d571af3a16be105c70dfda desmume-0.8.tar.gz +e48a01c7fc7dc083006e4756f1054621 desmume-0.9.tar.gz 64cb8e6288b7490f097e20fb262f0e97 desmume-man-pages-0.7.3.tar.gz --- desmume-0.7.0-dontlookinbuilddir.patch DELETED --- --- desmume-0.7.0-nobuggytoolsmenu.patch DELETED ---