10:23 a.m.
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24513
Modified Files:
.cvsignore sources vice-1.19-datadir.patch vice-htmlview.patch
vice-tmpnam.patch vice.spec
Log Message:
* Fri Aug 1 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.0-1
- New upstream release 2.0
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Jul 2008 19:37:37 -0000 1.2
+++ .cvsignore 1 Aug 2008 10:23:03 -0000 1.3
@@ -1,4 +1,4 @@
-vice-1.22.tar.gz
+vice-2.0.tar.gz
vice-largeicons.tar.bz2
vice-miniicons.tar.bz2
vice-normalicons.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Jul 2008 19:37:37 -0000 1.2
+++ sources 1 Aug 2008 10:23:03 -0000 1.3
@@ -1,4 +1,4 @@
-33204acbb74bafb12594d39b55888626 vice-1.22.tar.gz
+e4af3962469cb2279429718946528f1d vice-2.0.tar.gz
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vice-1.19-datadir.patch 25 Jul 2008 19:50:53 -0000 1.2
+++ vice-1.19-datadir.patch 1 Aug 2008 10:23:03 -0000 1.3
@@ -1,8 +1,7 @@
-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);
+--- vice-2.0/src/arch/unix/archdep.h.foo 2008-07-07 20:23:10.000000000 +0200
++++ vice-2.0/src/arch/unix/archdep.h 2008-08-01 10:19:47.000000000 +0200
+@@ -109,7 +109,7 @@ extern const char *archdep_home_path(voi
+ extern const char *archdep_pref_path;
/* Define the default system directory (where the ROMs are). */
-#ifdef __NetBSD__
@@ -10,27 +9,3 @@
#define LIBDIR PREFIX "/share/vice"
#else
#define LIBDIR PREFIX "/lib/vice"
-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)
-+ if (access(PREFIX "/share/vice/fonts/fonts.dir", R_OK) == 0)
- {
-- const char *cmd = "xset fp+ " PREFIX "/lib/vice/fonts";
-+ const char *cmd = "xset fp+ " PREFIX "/share/vice/fonts";
-
- if (system(cmd) != 0)
- fprintf(stderr, _("Can't add fontpath `%s'.\n"), cmd);
-@@ -1404,7 +1404,7 @@ void ui_exit(void)
- ui_dispatch_events();
-
- /* remove fontpath, Don't care about result */
-- system("xset fp- " PREFIX "/lib/vice/fonts");
-+ system("xset fp- " PREFIX "/share/vice/fonts");
-
- lib_free(s);
- exit(0);
vice-htmlview.patch:
Index: vice-htmlview.patch
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice-htmlview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vice-htmlview.patch 25 Jul 2008 19:37:37 -0000 1.1
+++ vice-htmlview.patch 1 Aug 2008 10:23:03 -0000 1.2
@@ -1,11 +1,12 @@
---- vice-1.21/src/arch/unix/x11/ui-resources.c.htmlview 2007-03-03 10:07:37.000000000
+0100
-+++ vice-1.21/src/arch/unix/x11/ui-resources.c 2007-03-10 14:44:58.000000000 +0100
-@@ -112,7 +112,7 @@
+diff -up vice-2.0/src/arch/unix/x11/ui-resources.c.bar
vice-2.0/src/arch/unix/x11/ui-resources.c
+--- vice-2.0/src/arch/unix/x11/ui-resources.c.bar 2008-07-07 20:23:10.000000000 +0200
++++ vice-2.0/src/arch/unix/x11/ui-resources.c 2008-08-01 10:24:23.000000000 +0200
+@@ -112,7 +112,7 @@ static const resource_string_t resources
#ifdef MACOSX_SUPPORT
"/usr/bin/open %s",
#else
-- "netscape %s",
-+ "htmlview %s",
+- "firefox %s",
++ "xdg-open %s",
#endif
RES_EVENT_NO, NULL,
&ui_resources.html_browser_command,
vice-tmpnam.patch:
Index: vice-tmpnam.patch
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice-tmpnam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vice-tmpnam.patch 25 Jul 2008 19:37:37 -0000 1.1
+++ vice-tmpnam.patch 1 Aug 2008 10:23:03 -0000 1.2
@@ -1,17 +1,18 @@
---- vice-1.20/src/arch/unix/archdep.c.tmpnam 2006-07-10 16:24:09.000000000 +0200
-+++ vice-1.20/src/arch/unix/archdep.c 2006-09-23 09:18:46.000000000 +0200
-@@ -373,36 +373,28 @@
- }
+diff -up vice-2.0/src/arch/unix/archdep.c.foobar vice-2.0/src/arch/unix/archdep.c
+--- vice-2.0/src/arch/unix/archdep.c.foobar 2008-07-07 20:23:10.000000000 +0200
++++ vice-2.0/src/arch/unix/archdep.c 2008-08-01 10:27:52.000000000 +0200
+@@ -416,37 +416,27 @@ char *archdep_quote_parameter(const char
char *archdep_tmpnam(void)
--{
+ {
-#ifdef GP2X
- static unsigned int tmp_string_counter=0;
- char tmp_string[32];
-
- sprintf(tmp_string,"vice%d.tmp",tmp_string_counter++);
- return lib_stralloc(tmp_string);
--#elif HAVE_MKSTEMP
+-#else
+-#ifdef HAVE_MKSTEMP
- char *tmpName;
- const char mkstempTemplate[] = "/vice.XXXXXX";
- int fd;
@@ -21,7 +22,6 @@
- if ((tmp = getenv("TMPDIR")) != NULL ) {
- strncpy(tmpName, tmp, ioutil_maxpathlen());
- tmpName[ioutil_maxpathlen() - sizeof(mkstempTemplate)] = '\0';
-+{
+ char *tmp, *name;
+
+ name = util_concat(archdep_home_path(), "/.vice", NULL);
@@ -50,6 +50,7 @@
+ return tmp;
#else
- return lib_stralloc(tmpnam(NULL));
+-#endif
+ name = lib_stralloc(tmp);
+ free(tmp);
+ return name;
Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vice.spec 25 Jul 2008 19:50:53 -0000 1.2
+++ vice.spec 1 Aug 2008 10:23:03 -0000 1.3
@@ -1,11 +1,11 @@
Name: vice
-Version: 1.22
-Release: 2%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPL
URL: http://www.viceteam.org/
-Source0: http://www.viceteam.org/online/vice-%{version}.tar.gz
+Source0:
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-...
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
@@ -116,6 +116,9 @@
%changelog
+* Fri Aug 1 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.0-1
+- New upstream release 2.0
+
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-2
- Release bump for rpmfusion