rpms/vice/devel vice-1.19-datadir.patch,1.1,1.2 vice.spec,1.1,1.2

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22316

Modified Files:
	vice-1.19-datadir.patch vice.spec 
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.22-2
- Release bump for rpmfusion


vice-1.19-datadir.patch:

Index: vice-1.19-datadir.patch
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice-1.19-datadir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vice-1.19-datadir.patch	25 Jul 2008 19:37:37 -0000	1.1
+++ vice-1.19-datadir.patch	25 Jul 2008 19:50:53 -0000	1.2
@@ -1,5 +1,6 @@
---- vice-1.19/src/arch/unix/archdep.h~	2006-06-20 21:46:38.000000000 +0200
-+++ vice-1.19/src/arch/unix/archdep.h	2006-06-20 21:46:38.000000000 +0200
+diff -up vice-1.22/src/arch/unix/archdep.h.foo vice-1.22/src/arch/unix/archdep.h
+--- vice-1.22/src/arch/unix/archdep.h.foo	2007-04-29 20:50:17.000000000 +0200
++++ vice-1.22/src/arch/unix/archdep.h	2008-07-25 21:49:40.000000000 +0200
 @@ -106,7 +106,7 @@
  extern const char *archdep_home_path(void);
  
@@ -9,10 +10,11 @@
  #define LIBDIR          PREFIX "/share/vice"
  #else
  #define LIBDIR          PREFIX "/lib/vice"
---- vice-1.19/src/arch/unix/x11/gnome/x11ui.c~	2006-06-20 21:47:10.000000000 +0200
-+++ vice-1.19/src/arch/unix/x11/gnome/x11ui.c	2006-06-20 21:47:10.000000000 +0200
-@@ -420,9 +420,9 @@
- 		       GNOME_PARAM_POPT_TABLE, NULL, NULL);
+diff -up vice-1.22/src/arch/unix/x11/gnome/x11ui.c.foo vice-1.22/src/arch/unix/x11/gnome/x11ui.c
+--- vice-1.22/src/arch/unix/x11/gnome/x11ui.c.foo	2007-08-04 15:24:43.000000000 +0200
++++ vice-1.22/src/arch/unix/x11/gnome/x11ui.c	2008-07-25 21:49:40.000000000 +0200
+@@ -424,9 +424,9 @@ void archdep_ui_init(int argc, char *arg
+     gtk_init(&fake_argc, &fake_args);
  
      /* set X11 fontpath */
 -    if (access(PREFIX "/lib/vice/fonts/fonts.dir", R_OK) == 0)
@@ -23,7 +25,7 @@
  	
  	if (system(cmd) != 0)
  	    fprintf(stderr, _("Can't add fontpath `%s'.\n"), cmd);
-@@ -1404,7 +1404,7 @@
+@@ -1404,7 +1404,7 @@ void ui_exit(void)
  	ui_dispatch_events();
  
  	/* remove fontpath, Don't care about result */


Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vice.spec	25 Jul 2008 19:37:37 -0000	1.1
+++ vice.spec	25 Jul 2008 19:50:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vice
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Emulator for a variety of Commodore 8bit machines
 Group:          Applications/Emulators
 License:        GPL
@@ -116,6 +116,12 @@
 
 
 %changelog
+* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.22-2
+- Release bump for rpmfusion
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.22-1
+- New upstream release 1.22
+
 * Wed Apr 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.21-3%{?dist}
 - Further fixes to the xrand code to fix more crashes on exit (drb bz 87)