rpms/vice/F-8 vice-1.19-datadir.patch, NONE, 1.1 vice-1.20-monitor-crash.patch, NONE, 1.1 vice-htmlview.patch, NONE, 1.1 vice-tmpnam.patch, NONE, 1.1 vice.spec, NONE, 1.1 x128.desktop, NONE, 1.1 x64.desktop, NONE, 1.1 xcbm-ii.desktop, NONE, 1.1 xpet.desktop, NONE, 1.1 xplus4.desktop, NONE, 1.1 xvic.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22894
Modified Files:
.cvsignore sources
Added Files:
vice-1.19-datadir.patch vice-1.20-monitor-crash.patch
vice-htmlview.patch vice-tmpnam.patch vice.spec x128.desktop
x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop
xvic.desktop
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-2
- Release bump for rpmfusion
vice-1.19-datadir.patch:
--- NEW FILE vice-1.19-datadir.patch ---
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);
/* Define the default system directory (where the ROMs are). */
-#ifdef __NetBSD__
+#if 1
#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-1.20-monitor-crash.patch:
--- NEW FILE vice-1.20-monitor-crash.patch ---
diff -ur vice-1.20.orig/src/arch/unix/console.c vice-1.20/src/arch/unix/console.c
--- vice-1.20.orig/src/arch/unix/console.c 2006-07-10 18:09:33.000000000 +0200
+++ vice-1.20/src/arch/unix/console.c 2007-03-01 16:43:13.000000000 +0100
@@ -115,6 +115,8 @@
char *p, *ret_sting;
p = readline(prompt);
+ if (!p)
+ return (char *)-1; /* special EOF "address" */
ret_sting = lib_stralloc(p);
free(p);
diff -ur vice-1.20.orig/src/monitor/mon_util.c vice-1.20/src/monitor/mon_util.c
--- vice-1.20.orig/src/monitor/mon_util.c 2006-08-06 17:54:56.000000000 +0200
+++ vice-1.20/src/monitor/mon_util.c 2007-03-01 16:48:42.000000000 +0100
@@ -178,8 +178,8 @@
{
char *p = NULL;
- while (!p && !pchCommandLine) {
- /* as long as we don't have any return value... */
+ while (!p && !pchCommandLine && p != (char*)-1) {
+ /* as long as we don't have any return value and not EOF */
/* make sure to flush the output buffer */
mon_buffer_flush();
@@ -187,6 +187,8 @@
/* get input from the user */
p = uimon_get_in(&pchCommandLine, prompt);
}
+ if (p == (char *)-1)
+ p = NULL;
if (pchCommandLine) {
/* we have an "artificially" generated command line */
diff -ur vice-1.20.orig/src/monitor/monitor.c vice-1.20/src/monitor/monitor.c
--- vice-1.20.orig/src/monitor/monitor.c 2005-04-21 01:45:23.000000000 +0200
+++ vice-1.20/src/monitor/monitor.c 2007-03-01 17:05:00.000000000 +0100
@@ -1473,7 +1473,7 @@
{
mon_stop_output = 0;
if (cmd == NULL) {
- mon_out("\n");
+ exit_mon = 1;
} else {
if (!cmd[0]) {
if (!asm_mode) {
@@ -1547,12 +1547,22 @@
void monitor_startup(void)
{
+ char *in;
char prompt[40];
+ int first_prompt = 1;
monitor_open();
while (!exit_mon) {
make_prompt(prompt);
- monitor_process(uimon_in(prompt));
+ in = uimon_in(prompt);
+ /* special case, if we get an EOF on the first prompt, assume
+ we do not have a valid stdin and complain about it */
+ if (first_prompt && in == NULL)
+ ui_error("Monitor exited due to EOF from console.\n"
+ "If you want to use the monitor start vice from a terminal!");
+
+ monitor_process(in);
+ first_prompt = 0;
}
monitor_close(1);
}
vice-htmlview.patch:
--- NEW FILE vice-htmlview.patch ---
--- 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 @@
#ifdef MACOSX_SUPPORT
"/usr/bin/open %s",
#else
- "netscape %s",
+ "htmlview %s",
#endif
RES_EVENT_NO, NULL,
&ui_resources.html_browser_command,
vice-tmpnam.patch:
--- NEW FILE vice-tmpnam.patch ---
--- 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 @@
}
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
- char *tmpName;
- const char mkstempTemplate[] = "/vice.XXXXXX";
- int fd;
- char* tmp;
-
- tmpName = (char *)lib_malloc(ioutil_maxpathlen());
- 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);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
+ }
+ lib_free(name);
+
+ name = util_concat(archdep_home_path(), "/.vice/tmp", NULL);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
}
- else
- strcpy(tmpName, "/tmp" );
- strcat(tmpName, mkstempTemplate );
- if ((fd = mkstemp(tmpName)) < 0 )
- tmpName[0] = '\0';
- else
- close(fd);
- lib_free(tmpName);
- return lib_stralloc(tmpName);
+ tmp = tempnam(name, "vice");
+ lib_free(name);
+#ifndef LIB_DEBUG
+ return tmp;
#else
- return lib_stralloc(tmpnam(NULL));
+ name = lib_stralloc(tmp);
+ free(tmp);
+ return name;
#endif
}
--- NEW FILE vice.spec ---
Name: vice
Version: 1.22
Release: 2%{?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
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
Source4: xpet.desktop
Source5: xplus4.desktop
Source6: xvic.desktop
Source7: vice-miniicons.tar.bz2
Source8: vice-normalicons.tar.bz2
Source9: vice-largeicons.tar.bz2
Patch1: vice-1.19-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
Patch4: vice-1.20-monitor-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel
BuildRequires: ncurses-devel readline-devel SDL-devel alsa-lib-devel
BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
Requires: hicolor-icon-theme htmlview
%description
An emulator for a variety of Commodore 8bit machines, including the C16, C64,
C128, VIC-20, PET (all models, except SuperPET 9000), Plus-4, CBM-II
(aka C610)
%prep
%setup -q
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .tmpnam
%patch4 -p1 -z .mon
for i in man/*.1 doc/*.info*; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
mv $i.tmp $i
done
# not really needed, make sure these don't get used:
rm -f src/lib/*/*.c src/lib/*/*.h
%build
%configure --enable-gnomeui --enable-fullscreen --with-sdl
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name}
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# vice installs its docs under /usr/share/vice/doc, we install them ourselves
# with %doc, so nuke vice's install and create a symlink for the help function
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
for i in x128.desktop x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop \
xvic.desktop; do
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_SOURCE_DIR/$i
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
tar xvfj %{SOURCE7}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
tar xvfj %{SOURCE8}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
tar xvfj %{SOURCE9}
# remove "icon" from the icons name they are already in the icons dir.
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog FEEDBACK README doc/mon.txt doc/iec-bus.txt
%doc doc/html/*.html doc/html/images/* doc/html/plain/*
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/dribble-*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%{_infodir}/%{name}.info*
%{_mandir}/man1/*.1.gz
%changelog
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-2
- Release bump for rpmfusion
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-1
- New upstream release 1.22
* Wed Apr 25 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-3%{?dist}
- Further fixes to the xrand code to fix more crashes on exit (drb bz 87)
* Sun Apr 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-2%{?dist}
- Fix vice crashing with the latest libX11 update (dribble bz 91)
- Fix vice crashing on exit due to corrupted mem
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-1%{?dist}
- New upstream release 1.21
- Fixup .desktop file categories for games-menus usage
* Thu Mar 1 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-3%{?dist}
- Fix dribble bug 76
* Sun Oct 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-2%{?dist}
- Add a patch from upstream which fixes the black buttons / menu problem on FC5
* Sat Sep 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-1%{?dist}
- New upstream release 1.20
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-4%{?dist}
- add Patch3, which replaces tmpnam with tempnam and creates the tmpfiles
in a user owned dir fixing a tempfile security vulnerability.
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-3%{?dist}
- change --vendor fedora to --vendor dribble when installing .desktop files
- add %%{?dist} to release field in changelog
- add Patch2, which calls htmlview instead of netscape when accessing help.
- make BuildRequires conditonally Require modular or monolithic X using
%%{?fedora} to fix building on FC-4.
* Wed Jun 21 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-2
- convert manual and info pages to UTF8
* Tue Jun 20 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-1
- Initial Release, loosely based on the vice package by Ian Chapman
<ian.chapman(a)amiga-hardware.com>, the icons are from Mandrakes package.
--- NEW FILE x128.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X128 (Vice)
Comment=A Commodore 128 Emulator
Exec=x128
Icon=c128.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE x64.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X64 (Vice)
Comment=A Commodore 64 Emulator
Exec=x64
Icon=c64.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xcbm-ii.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XCBM-II (Vice)
Comment=A CBM-II (C610) Emulator
Exec=xcbm2
Icon=c610.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xpet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPET (Vice)
Comment=A Commodore PET Emulator
Exec=xpet
Icon=pet.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xplus4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPlus-4 (Vice)
Comment=A Commodore Plus-4 Emulator
Exec=xplus4
Icon=plus4.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xvic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XVic (Vice)
Comment=A Commodore VIC-20 Emulator
Exec=xvic
Icon=vic20.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 16:12:38 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:55:08 -0000 1.2
@@ -0,0 +1,4 @@
+vice-1.22.tar.gz
+vice-largeicons.tar.bz2
+vice-miniicons.tar.bz2
+vice-normalicons.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/vice/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 16:12:38 -0000 1.1
+++ sources 25 Jul 2008 19:55:08 -0000 1.2
@@ -0,0 +1,4 @@
+33204acbb74bafb12594d39b55888626 vice-1.22.tar.gz
+a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
+c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
+1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
16 years, 2 months
rpms/wormsofprey/F-9 wormsofprey.desktop, NONE, 1.1 wormsofprey.png, NONE, 1.1 wormsofprey.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/wormsofprey/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22776
Modified Files:
.cvsignore sources
Added Files:
wormsofprey.desktop wormsofprey.png wormsofprey.spec
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
- Release bump for rpmfusion
--- NEW FILE wormsofprey.desktop ---
[Desktop Entry]
Name=Wörms of Prey
Comment=Team based bomb / scorched like game
Exec=wormsofprey
Icon=wormsofprey
Terminal=false
Type=Application
Categories=Game;ArcadeGame;StrategyGame;
--- NEW FILE wormsofprey.spec ---
Name: wormsofprey
Version: 0.4.3
Release: 3%{?dist}
Summary: Team based bomb / scorched like game
Group: Amusements/Games
License: GPLv2+
URL: http://wormsofprey.org/
Source0: http://wormsofprey.org/download/wop-%{version}-src.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: wop-0.4.3-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel
BuildRequires: zlib-devel imake desktop-file-utils
Requires: %{name}-data >= 20051221
%description
Each player controls a team of worms and the purpose is to ellimate all the
other worms, for which each worm has a number of different weapons at his
disposal. Features: Multi-player with one player per computer, Completely new
graphics, Low bandwidth usage, Different game modes (death match, team play),
Ropes can be attached to any object, Rope can be released, Any number of ropes
and Multiple moving goals.
%prep
%setup -q -n wop-%{version}
%patch0 -p1
sed -i 's|^CXXFLAGS ?= .*|CXXFLAGS ?= %{optflags}|' sdlwidgets/Makefile \
src/Makefile
sed -i 's|data = ./data|data = %{_datadir}/%{name}|' woprc
sed -i 's|\r||' ChangeLog
iconv -f ISO-8859-1 -t UTF-8 REVIEWS > REVIEWS.tmp
touch -r REVIEWS REVIEWS.tmp
mv REVIEWS.tmp REVIEWS
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
install -m 644 woprc $RPM_BUILD_ROOT/%{_sysconfdir}
install -m 755 bin/wop $RPM_BUILD_ROOT/%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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
%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
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README README-COMMAND-LINE-OPTIONS.txt REVIEWS
%config(noreplace) %{_sysconfdir}/woprc
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%changelog
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
- Release bump for rpmfusion
* Thu Mar 20 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-2%{?dist}
- Fix building with gcc 4.3
* Wed Aug 9 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 13:58:56 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:53:03 -0000 1.2
@@ -0,0 +1 @@
+wop-0.4.3-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 13:58:56 -0000 1.1
+++ sources 25 Jul 2008 19:53:03 -0000 1.2
@@ -0,0 +1 @@
+ae07e9e1092de6c447a9af2cf8e90959 wop-0.4.3-src.tar.bz2
16 years, 2 months
rpms/vice/F-9 vice-1.19-datadir.patch, NONE, 1.1 vice-1.20-monitor-crash.patch, NONE, 1.1 vice-htmlview.patch, NONE, 1.1 vice-tmpnam.patch, NONE, 1.1 vice.spec, NONE, 1.1 x128.desktop, NONE, 1.1 x64.desktop, NONE, 1.1 xcbm-ii.desktop, NONE, 1.1 xpet.desktop, NONE, 1.1 xplus4.desktop, NONE, 1.1 xvic.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22686
Modified Files:
.cvsignore sources
Added Files:
vice-1.19-datadir.patch vice-1.20-monitor-crash.patch
vice-htmlview.patch vice-tmpnam.patch vice.spec x128.desktop
x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop
xvic.desktop
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-2
- Release bump for rpmfusion
vice-1.19-datadir.patch:
--- NEW FILE vice-1.19-datadir.patch ---
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);
/* Define the default system directory (where the ROMs are). */
-#ifdef __NetBSD__
+#if 1
#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-1.20-monitor-crash.patch:
--- NEW FILE vice-1.20-monitor-crash.patch ---
diff -ur vice-1.20.orig/src/arch/unix/console.c vice-1.20/src/arch/unix/console.c
--- vice-1.20.orig/src/arch/unix/console.c 2006-07-10 18:09:33.000000000 +0200
+++ vice-1.20/src/arch/unix/console.c 2007-03-01 16:43:13.000000000 +0100
@@ -115,6 +115,8 @@
char *p, *ret_sting;
p = readline(prompt);
+ if (!p)
+ return (char *)-1; /* special EOF "address" */
ret_sting = lib_stralloc(p);
free(p);
diff -ur vice-1.20.orig/src/monitor/mon_util.c vice-1.20/src/monitor/mon_util.c
--- vice-1.20.orig/src/monitor/mon_util.c 2006-08-06 17:54:56.000000000 +0200
+++ vice-1.20/src/monitor/mon_util.c 2007-03-01 16:48:42.000000000 +0100
@@ -178,8 +178,8 @@
{
char *p = NULL;
- while (!p && !pchCommandLine) {
- /* as long as we don't have any return value... */
+ while (!p && !pchCommandLine && p != (char*)-1) {
+ /* as long as we don't have any return value and not EOF */
/* make sure to flush the output buffer */
mon_buffer_flush();
@@ -187,6 +187,8 @@
/* get input from the user */
p = uimon_get_in(&pchCommandLine, prompt);
}
+ if (p == (char *)-1)
+ p = NULL;
if (pchCommandLine) {
/* we have an "artificially" generated command line */
diff -ur vice-1.20.orig/src/monitor/monitor.c vice-1.20/src/monitor/monitor.c
--- vice-1.20.orig/src/monitor/monitor.c 2005-04-21 01:45:23.000000000 +0200
+++ vice-1.20/src/monitor/monitor.c 2007-03-01 17:05:00.000000000 +0100
@@ -1473,7 +1473,7 @@
{
mon_stop_output = 0;
if (cmd == NULL) {
- mon_out("\n");
+ exit_mon = 1;
} else {
if (!cmd[0]) {
if (!asm_mode) {
@@ -1547,12 +1547,22 @@
void monitor_startup(void)
{
+ char *in;
char prompt[40];
+ int first_prompt = 1;
monitor_open();
while (!exit_mon) {
make_prompt(prompt);
- monitor_process(uimon_in(prompt));
+ in = uimon_in(prompt);
+ /* special case, if we get an EOF on the first prompt, assume
+ we do not have a valid stdin and complain about it */
+ if (first_prompt && in == NULL)
+ ui_error("Monitor exited due to EOF from console.\n"
+ "If you want to use the monitor start vice from a terminal!");
+
+ monitor_process(in);
+ first_prompt = 0;
}
monitor_close(1);
}
vice-htmlview.patch:
--- NEW FILE vice-htmlview.patch ---
--- 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 @@
#ifdef MACOSX_SUPPORT
"/usr/bin/open %s",
#else
- "netscape %s",
+ "htmlview %s",
#endif
RES_EVENT_NO, NULL,
&ui_resources.html_browser_command,
vice-tmpnam.patch:
--- NEW FILE vice-tmpnam.patch ---
--- 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 @@
}
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
- char *tmpName;
- const char mkstempTemplate[] = "/vice.XXXXXX";
- int fd;
- char* tmp;
-
- tmpName = (char *)lib_malloc(ioutil_maxpathlen());
- 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);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
+ }
+ lib_free(name);
+
+ name = util_concat(archdep_home_path(), "/.vice/tmp", NULL);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
}
- else
- strcpy(tmpName, "/tmp" );
- strcat(tmpName, mkstempTemplate );
- if ((fd = mkstemp(tmpName)) < 0 )
- tmpName[0] = '\0';
- else
- close(fd);
- lib_free(tmpName);
- return lib_stralloc(tmpName);
+ tmp = tempnam(name, "vice");
+ lib_free(name);
+#ifndef LIB_DEBUG
+ return tmp;
#else
- return lib_stralloc(tmpnam(NULL));
+ name = lib_stralloc(tmp);
+ free(tmp);
+ return name;
#endif
}
--- NEW FILE vice.spec ---
Name: vice
Version: 1.22
Release: 2%{?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
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
Source4: xpet.desktop
Source5: xplus4.desktop
Source6: xvic.desktop
Source7: vice-miniicons.tar.bz2
Source8: vice-normalicons.tar.bz2
Source9: vice-largeicons.tar.bz2
Patch1: vice-1.19-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
Patch4: vice-1.20-monitor-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel
BuildRequires: ncurses-devel readline-devel SDL-devel alsa-lib-devel
BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
Requires: hicolor-icon-theme htmlview
%description
An emulator for a variety of Commodore 8bit machines, including the C16, C64,
C128, VIC-20, PET (all models, except SuperPET 9000), Plus-4, CBM-II
(aka C610)
%prep
%setup -q
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .tmpnam
%patch4 -p1 -z .mon
for i in man/*.1 doc/*.info*; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
mv $i.tmp $i
done
# not really needed, make sure these don't get used:
rm -f src/lib/*/*.c src/lib/*/*.h
%build
%configure --enable-gnomeui --enable-fullscreen --with-sdl
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name}
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# vice installs its docs under /usr/share/vice/doc, we install them ourselves
# with %doc, so nuke vice's install and create a symlink for the help function
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
for i in x128.desktop x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop \
xvic.desktop; do
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_SOURCE_DIR/$i
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
tar xvfj %{SOURCE7}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
tar xvfj %{SOURCE8}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
tar xvfj %{SOURCE9}
# remove "icon" from the icons name they are already in the icons dir.
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog FEEDBACK README doc/mon.txt doc/iec-bus.txt
%doc doc/html/*.html doc/html/images/* doc/html/plain/*
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/dribble-*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%{_infodir}/%{name}.info*
%{_mandir}/man1/*.1.gz
%changelog
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-2
- Release bump for rpmfusion
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-1
- New upstream release 1.22
* Wed Apr 25 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-3%{?dist}
- Further fixes to the xrand code to fix more crashes on exit (drb bz 87)
* Sun Apr 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-2%{?dist}
- Fix vice crashing with the latest libX11 update (dribble bz 91)
- Fix vice crashing on exit due to corrupted mem
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-1%{?dist}
- New upstream release 1.21
- Fixup .desktop file categories for games-menus usage
* Thu Mar 1 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-3%{?dist}
- Fix dribble bug 76
* Sun Oct 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-2%{?dist}
- Add a patch from upstream which fixes the black buttons / menu problem on FC5
* Sat Sep 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-1%{?dist}
- New upstream release 1.20
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-4%{?dist}
- add Patch3, which replaces tmpnam with tempnam and creates the tmpfiles
in a user owned dir fixing a tempfile security vulnerability.
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-3%{?dist}
- change --vendor fedora to --vendor dribble when installing .desktop files
- add %%{?dist} to release field in changelog
- add Patch2, which calls htmlview instead of netscape when accessing help.
- make BuildRequires conditonally Require modular or monolithic X using
%%{?fedora} to fix building on FC-4.
* Wed Jun 21 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-2
- convert manual and info pages to UTF8
* Tue Jun 20 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-1
- Initial Release, loosely based on the vice package by Ian Chapman
<ian.chapman(a)amiga-hardware.com>, the icons are from Mandrakes package.
--- NEW FILE x128.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X128 (Vice)
Comment=A Commodore 128 Emulator
Exec=x128
Icon=c128.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE x64.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X64 (Vice)
Comment=A Commodore 64 Emulator
Exec=x64
Icon=c64.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xcbm-ii.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XCBM-II (Vice)
Comment=A CBM-II (C610) Emulator
Exec=xcbm2
Icon=c610.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xpet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPET (Vice)
Comment=A Commodore PET Emulator
Exec=xpet
Icon=pet.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xplus4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPlus-4 (Vice)
Comment=A Commodore Plus-4 Emulator
Exec=xplus4
Icon=plus4.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xvic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XVic (Vice)
Comment=A Commodore VIC-20 Emulator
Exec=xvic
Icon=vic20.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 16:12:38 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:52:59 -0000 1.2
@@ -0,0 +1,4 @@
+vice-1.22.tar.gz
+vice-largeicons.tar.bz2
+vice-miniicons.tar.bz2
+vice-normalicons.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/vice/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 16:12:38 -0000 1.1
+++ sources 25 Jul 2008 19:52:59 -0000 1.2
@@ -0,0 +1,4 @@
+33204acbb74bafb12594d39b55888626 vice-1.22.tar.gz
+a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
+c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
+1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
16 years, 2 months
rpms/vice/devel vice-1.19-datadir.patch,1.1,1.2 vice.spec,1.1,1.2
by jwrdegoede
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(a)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(a)hhs.nl> 1.22-2
+- Release bump for rpmfusion
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.22-1
+- New upstream release 1.22
+
* Wed Apr 25 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-3%{?dist}
- Further fixes to the xrand code to fix more crashes on exit (drb bz 87)
16 years, 2 months
rpms/wormsofprey/devel wormsofprey.spec,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/wormsofprey/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22214
Modified Files:
wormsofprey.spec
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
- Release bump for rpmfusion
Index: wormsofprey.spec
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/devel/wormsofprey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wormsofprey.spec 25 Jul 2008 19:43:47 -0000 1.1
+++ wormsofprey.spec 25 Jul 2008 19:49:25 -0000 1.2
@@ -1,6 +1,6 @@
Name: wormsofprey
Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Team based bomb / scorched like game
Group: Amusements/Games
License: GPLv2+
@@ -85,6 +85,9 @@
%changelog
+* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
+- Release bump for rpmfusion
+
* Thu Mar 20 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-2%{?dist}
- Fix building with gcc 4.3
16 years, 2 months
rpms/wormsofprey/devel wop-0.4.3-gcc43.patch, NONE, 1.1 wormsofprey.desktop, NONE, 1.1 wormsofprey.png, NONE, 1.1 wormsofprey.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/wormsofprey/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21821/devel
Modified Files:
.cvsignore sources
Added Files:
wop-0.4.3-gcc43.patch wormsofprey.desktop wormsofprey.png
wormsofprey.spec
Log Message:
initial wormsofprey upload
wop-0.4.3-gcc43.patch:
--- NEW FILE wop-0.4.3-gcc43.patch ---
--- wop-0.4.3/src/scusibot.cpp 2005-10-16 19:53:05.000000000 +0200
+++ wop-0.4.3.new/src/scusibot.cpp 2008-03-20 10:52:07.000000000 +0100
@@ -5,6 +5,7 @@
#include "stationarygun.hpp"
#include "global.hpp"
#include <vector>
+#include <algorithm>
ScusiBot::ScusiBot()
: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
--- wop-0.4.3/src/spriteset.cpp 2006-03-27 12:27:53.000000000 +0200
+++ wop-0.4.3.new/src/spriteset.cpp 2008-03-20 13:08:52.000000000 +0100
@@ -2,6 +2,7 @@
#include "spriteset.hpp"
#include "global.hpp"
+#include "sprite.hpp"
/**********************************************************/
@@ -17,6 +18,9 @@
#endif // SUPPRESS_COLORING
#endif // BLACK_
+/* force creation of an implementation of SpriteSet<Sprite> */
+static SpriteSet<Sprite> foo;
+
/**********************************************************/
template <class T>
--- NEW FILE wormsofprey.desktop ---
[Desktop Entry]
Name=Wörms of Prey
Comment=Team based bomb / scorched like game
Exec=wormsofprey
Icon=wormsofprey
Terminal=false
Type=Application
Categories=Game;ArcadeGame;StrategyGame;
--- NEW FILE wormsofprey.spec ---
Name: wormsofprey
Version: 0.4.3
Release: 2%{?dist}
Summary: Team based bomb / scorched like game
Group: Amusements/Games
License: GPLv2+
URL: http://wormsofprey.org/
Source0: http://wormsofprey.org/download/wop-%{version}-src.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: wop-0.4.3-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel
BuildRequires: zlib-devel imake desktop-file-utils
Requires: %{name}-data >= 20051221
%description
Each player controls a team of worms and the purpose is to ellimate all the
other worms, for which each worm has a number of different weapons at his
disposal. Features: Multi-player with one player per computer, Completely new
graphics, Low bandwidth usage, Different game modes (death match, team play),
Ropes can be attached to any object, Rope can be released, Any number of ropes
and Multiple moving goals.
%prep
%setup -q -n wop-%{version}
%patch0 -p1
sed -i 's|^CXXFLAGS ?= .*|CXXFLAGS ?= %{optflags}|' sdlwidgets/Makefile \
src/Makefile
sed -i 's|data = ./data|data = %{_datadir}/%{name}|' woprc
sed -i 's|\r||' ChangeLog
iconv -f ISO-8859-1 -t UTF-8 REVIEWS > REVIEWS.tmp
touch -r REVIEWS REVIEWS.tmp
mv REVIEWS.tmp REVIEWS
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
install -m 644 woprc $RPM_BUILD_ROOT/%{_sysconfdir}
install -m 755 bin/wop $RPM_BUILD_ROOT/%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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
%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
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README README-COMMAND-LINE-OPTIONS.txt REVIEWS
%config(noreplace) %{_sysconfdir}/woprc
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%changelog
* Thu Mar 20 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-2%{?dist}
- Fix building with gcc 4.3
* Wed Aug 9 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 13:58:56 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:43:47 -0000 1.2
@@ -0,0 +1 @@
+wop-0.4.3-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 13:58:56 -0000 1.1
+++ sources 25 Jul 2008 19:43:47 -0000 1.2
@@ -0,0 +1 @@
+ae07e9e1092de6c447a9af2cf8e90959 wop-0.4.3-src.tar.bz2
16 years, 2 months
rpms/stella/F-8 stella-2.6.1-gcc43.patch, NONE, 1.1 stella.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/stella/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21303
Modified Files:
.cvsignore sources
Added Files:
stella-2.6.1-gcc43.patch stella.spec
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
- Release bump for rpmfusion
stella-2.6.1-gcc43.patch:
--- NEW FILE stella-2.6.1-gcc43.patch ---
--- stella-2.6.1/src/emucore/Cart.cxx 2008-05-17 01:56:21.000000000 +0200
+++ stella-2.6.1.new/src/emucore/Cart.cxx 2008-06-02 09:16:58.000000000 +0200
@@ -17,6 +17,7 @@
//============================================================================
#include <cassert>
+#include <cstring>
#include <sstream>
#include "bspf.hxx"
--- stella-2.6.1/src/emucore/CartAR.cxx 2008-03-29 00:29:13.000000000 +0100
+++ stella-2.6.1.new/src/emucore/CartAR.cxx 2008-06-02 09:16:58.000000000 +0200
@@ -17,6 +17,7 @@
//============================================================================
#include <cassert>
+#include <cstring>
#include "M6502Hi.hxx"
#include "Random.hxx"
--- stella-2.6.1/src/emucore/TrackBall.cxx 2008-05-19 05:15:12.000000000 +0200
+++ stella-2.6.1.new/src/emucore/TrackBall.cxx 2008-06-02 09:20:46.000000000 +0200
@@ -16,6 +16,8 @@
// $Id: TrackBall.cxx,v 1.2 2008/05/19 03:15:12 stephena Exp $
//============================================================================
+#include <stdlib.h>
+
#include "Event.hxx"
#include "System.hxx"
#include "TIA.hxx"
--- stella-2.6.1/src/unix/SerialPortUNIX.cxx 2008-04-11 19:56:34.000000000 +0200
+++ stella-2.6.1.new/src/unix/SerialPortUNIX.cxx 2008-06-02 09:17:55.000000000 +0200
@@ -23,6 +23,7 @@
#include <sys/termios.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+#include <string.h>
#include "SerialPortUNIX.hxx"
--- NEW FILE stella.spec ---
Name: stella
Version: 2.6.1
Release: 2%{?dist}
License: GPLv2+
Summary: Atari 2600 Video Computer System emulator
Group: Applications/Emulators
URL: http://stella.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
Patch0: stella-2.6.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libpng-devel desktop-file-utils
%ifarch %{ix86}
BuildRequires: nasm
%endif
Requires: hicolor-icon-theme
%description
The Atari 2600 Video Computer System (VCS), introduced in 1977, was
the most popular home video game system of the early 1980's. This
emulator will run most Atari ROM images, so that you can play your
favorite old Atari 2600 games in GNU/Linux.
%prep
%setup -q
%patch0 -p1
sed -i 's|$(INSTALL) -c -s -m 755|$(INSTALL) -c -m 755|g' Makefile
sed -i 's|-fomit-frame-pointer||g' Makefile
%build
export CXXFLAGS=$RPM_OPT_FLAGS
# this is not a real configure script, so do NOT use %%configure
# the --libdir is not used but still added to shutup rpmlint
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_datadir}/doc/%{name}-%{version}
# remove icon from pre fdo locations
rm $RPM_BUILD_ROOT%{_datadir}/icons/{mini,large,}/%{name}.png
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--remove-category Application \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 src/common/%{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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
%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
%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}-%{version}
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
- Release bump for rpmfusion
* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-1
- New upstream release 2.6.1
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.5.1-1%{?dist}
- New upstream release 2.5.1
* Sun Mar 30 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.5-1%{?dist}
- New upstream release 2.5
* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.2-1%{?dist}
- New upstream bugfix release 2.4.2
* Tue Aug 28 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.1-1%{?dist}
- New upstream bugfix release 2.4.1
* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4-1%{?dist}
- New upstream release 2.4
- Update license tag for new licensing guidelines compliance
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.3.5-1%{?dist}
- New upstream release 2.3.5
- Fixup .desktop file categories for games-menus usage
* Mon Aug 14 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
- Initial Dribble package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/stella/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 13:57:02 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:40:50 -0000 1.2
@@ -0,0 +1 @@
+stella-2.6.1-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/stella/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 13:57:02 -0000 1.1
+++ sources 25 Jul 2008 19:40:50 -0000 1.2
@@ -0,0 +1 @@
+7ad3e1b5dcd8b3c6777c704be28a74fa stella-2.6.1-src.tar.gz
16 years, 2 months
rpms/stella/F-9 stella-2.6.1-gcc43.patch, NONE, 1.1 stella.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/stella/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21198
Modified Files:
.cvsignore sources
Added Files:
stella-2.6.1-gcc43.patch stella.spec
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
- Release bump for rpmfusion
stella-2.6.1-gcc43.patch:
--- NEW FILE stella-2.6.1-gcc43.patch ---
--- stella-2.6.1/src/emucore/Cart.cxx 2008-05-17 01:56:21.000000000 +0200
+++ stella-2.6.1.new/src/emucore/Cart.cxx 2008-06-02 09:16:58.000000000 +0200
@@ -17,6 +17,7 @@
//============================================================================
#include <cassert>
+#include <cstring>
#include <sstream>
#include "bspf.hxx"
--- stella-2.6.1/src/emucore/CartAR.cxx 2008-03-29 00:29:13.000000000 +0100
+++ stella-2.6.1.new/src/emucore/CartAR.cxx 2008-06-02 09:16:58.000000000 +0200
@@ -17,6 +17,7 @@
//============================================================================
#include <cassert>
+#include <cstring>
#include "M6502Hi.hxx"
#include "Random.hxx"
--- stella-2.6.1/src/emucore/TrackBall.cxx 2008-05-19 05:15:12.000000000 +0200
+++ stella-2.6.1.new/src/emucore/TrackBall.cxx 2008-06-02 09:20:46.000000000 +0200
@@ -16,6 +16,8 @@
// $Id: TrackBall.cxx,v 1.2 2008/05/19 03:15:12 stephena Exp $
//============================================================================
+#include <stdlib.h>
+
#include "Event.hxx"
#include "System.hxx"
#include "TIA.hxx"
--- stella-2.6.1/src/unix/SerialPortUNIX.cxx 2008-04-11 19:56:34.000000000 +0200
+++ stella-2.6.1.new/src/unix/SerialPortUNIX.cxx 2008-06-02 09:17:55.000000000 +0200
@@ -23,6 +23,7 @@
#include <sys/termios.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+#include <string.h>
#include "SerialPortUNIX.hxx"
--- NEW FILE stella.spec ---
Name: stella
Version: 2.6.1
Release: 2%{?dist}
License: GPLv2+
Summary: Atari 2600 Video Computer System emulator
Group: Applications/Emulators
URL: http://stella.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
Patch0: stella-2.6.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libpng-devel desktop-file-utils
%ifarch %{ix86}
BuildRequires: nasm
%endif
Requires: hicolor-icon-theme
%description
The Atari 2600 Video Computer System (VCS), introduced in 1977, was
the most popular home video game system of the early 1980's. This
emulator will run most Atari ROM images, so that you can play your
favorite old Atari 2600 games in GNU/Linux.
%prep
%setup -q
%patch0 -p1
sed -i 's|$(INSTALL) -c -s -m 755|$(INSTALL) -c -m 755|g' Makefile
sed -i 's|-fomit-frame-pointer||g' Makefile
%build
export CXXFLAGS=$RPM_OPT_FLAGS
# this is not a real configure script, so do NOT use %%configure
# the --libdir is not used but still added to shutup rpmlint
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_datadir}/doc/%{name}-%{version}
# remove icon from pre fdo locations
rm $RPM_BUILD_ROOT%{_datadir}/icons/{mini,large,}/%{name}.png
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--remove-category Application \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 src/common/%{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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
%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
%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}-%{version}
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
- Release bump for rpmfusion
* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-1
- New upstream release 2.6.1
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.5.1-1%{?dist}
- New upstream release 2.5.1
* Sun Mar 30 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.5-1%{?dist}
- New upstream release 2.5
* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.2-1%{?dist}
- New upstream bugfix release 2.4.2
* Tue Aug 28 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.1-1%{?dist}
- New upstream bugfix release 2.4.1
* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4-1%{?dist}
- New upstream release 2.4
- Update license tag for new licensing guidelines compliance
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.3.5-1%{?dist}
- New upstream release 2.3.5
- Fixup .desktop file categories for games-menus usage
* Mon Aug 14 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
- Initial Dribble package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/stella/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 13:57:02 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:40:33 -0000 1.2
@@ -0,0 +1 @@
+stella-2.6.1-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/stella/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 13:57:02 -0000 1.1
+++ sources 25 Jul 2008 19:40:33 -0000 1.2
@@ -0,0 +1 @@
+7ad3e1b5dcd8b3c6777c704be28a74fa stella-2.6.1-src.tar.gz
16 years, 2 months
rpms/vice/devel vice-1.19-datadir.patch, NONE, 1.1 vice-1.20-monitor-crash.patch, NONE, 1.1 vice-htmlview.patch, NONE, 1.1 vice-tmpnam.patch, NONE, 1.1 vice.spec, NONE, 1.1 x128.desktop, NONE, 1.1 x64.desktop, NONE, 1.1 xcbm-ii.desktop, NONE, 1.1 xpet.desktop, NONE, 1.1 xplus4.desktop, NONE, 1.1 xvic.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21033/devel
Modified Files:
.cvsignore sources
Added Files:
vice-1.19-datadir.patch vice-1.20-monitor-crash.patch
vice-htmlview.patch vice-tmpnam.patch vice.spec x128.desktop
x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop
xvic.desktop
Log Message:
initial vice import
vice-1.19-datadir.patch:
--- NEW FILE vice-1.19-datadir.patch ---
--- 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
@@ -106,7 +106,7 @@
extern const char *archdep_home_path(void);
/* Define the default system directory (where the ROMs are). */
-#ifdef __NetBSD__
+#if 1
#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);
/* 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 @@
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-1.20-monitor-crash.patch:
--- NEW FILE vice-1.20-monitor-crash.patch ---
diff -ur vice-1.20.orig/src/arch/unix/console.c vice-1.20/src/arch/unix/console.c
--- vice-1.20.orig/src/arch/unix/console.c 2006-07-10 18:09:33.000000000 +0200
+++ vice-1.20/src/arch/unix/console.c 2007-03-01 16:43:13.000000000 +0100
@@ -115,6 +115,8 @@
char *p, *ret_sting;
p = readline(prompt);
+ if (!p)
+ return (char *)-1; /* special EOF "address" */
ret_sting = lib_stralloc(p);
free(p);
diff -ur vice-1.20.orig/src/monitor/mon_util.c vice-1.20/src/monitor/mon_util.c
--- vice-1.20.orig/src/monitor/mon_util.c 2006-08-06 17:54:56.000000000 +0200
+++ vice-1.20/src/monitor/mon_util.c 2007-03-01 16:48:42.000000000 +0100
@@ -178,8 +178,8 @@
{
char *p = NULL;
- while (!p && !pchCommandLine) {
- /* as long as we don't have any return value... */
+ while (!p && !pchCommandLine && p != (char*)-1) {
+ /* as long as we don't have any return value and not EOF */
/* make sure to flush the output buffer */
mon_buffer_flush();
@@ -187,6 +187,8 @@
/* get input from the user */
p = uimon_get_in(&pchCommandLine, prompt);
}
+ if (p == (char *)-1)
+ p = NULL;
if (pchCommandLine) {
/* we have an "artificially" generated command line */
diff -ur vice-1.20.orig/src/monitor/monitor.c vice-1.20/src/monitor/monitor.c
--- vice-1.20.orig/src/monitor/monitor.c 2005-04-21 01:45:23.000000000 +0200
+++ vice-1.20/src/monitor/monitor.c 2007-03-01 17:05:00.000000000 +0100
@@ -1473,7 +1473,7 @@
{
mon_stop_output = 0;
if (cmd == NULL) {
- mon_out("\n");
+ exit_mon = 1;
} else {
if (!cmd[0]) {
if (!asm_mode) {
@@ -1547,12 +1547,22 @@
void monitor_startup(void)
{
+ char *in;
char prompt[40];
+ int first_prompt = 1;
monitor_open();
while (!exit_mon) {
make_prompt(prompt);
- monitor_process(uimon_in(prompt));
+ in = uimon_in(prompt);
+ /* special case, if we get an EOF on the first prompt, assume
+ we do not have a valid stdin and complain about it */
+ if (first_prompt && in == NULL)
+ ui_error("Monitor exited due to EOF from console.\n"
+ "If you want to use the monitor start vice from a terminal!");
+
+ monitor_process(in);
+ first_prompt = 0;
}
monitor_close(1);
}
vice-htmlview.patch:
--- NEW FILE vice-htmlview.patch ---
--- 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 @@
#ifdef MACOSX_SUPPORT
"/usr/bin/open %s",
#else
- "netscape %s",
+ "htmlview %s",
#endif
RES_EVENT_NO, NULL,
&ui_resources.html_browser_command,
vice-tmpnam.patch:
--- NEW FILE vice-tmpnam.patch ---
--- 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 @@
}
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
- char *tmpName;
- const char mkstempTemplate[] = "/vice.XXXXXX";
- int fd;
- char* tmp;
-
- tmpName = (char *)lib_malloc(ioutil_maxpathlen());
- 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);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
+ }
+ lib_free(name);
+
+ name = util_concat(archdep_home_path(), "/.vice/tmp", NULL);
+ if (access(name, F_OK)) {
+ mkdir(name, 0700);
}
- else
- strcpy(tmpName, "/tmp" );
- strcat(tmpName, mkstempTemplate );
- if ((fd = mkstemp(tmpName)) < 0 )
- tmpName[0] = '\0';
- else
- close(fd);
- lib_free(tmpName);
- return lib_stralloc(tmpName);
+ tmp = tempnam(name, "vice");
+ lib_free(name);
+#ifndef LIB_DEBUG
+ return tmp;
#else
- return lib_stralloc(tmpnam(NULL));
+ name = lib_stralloc(tmp);
+ free(tmp);
+ return name;
#endif
}
--- NEW FILE vice.spec ---
Name: vice
Version: 1.22
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
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
Source4: xpet.desktop
Source5: xplus4.desktop
Source6: xvic.desktop
Source7: vice-miniicons.tar.bz2
Source8: vice-normalicons.tar.bz2
Source9: vice-largeicons.tar.bz2
Patch1: vice-1.19-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
Patch4: vice-1.20-monitor-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel
BuildRequires: ncurses-devel readline-devel SDL-devel alsa-lib-devel
BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
Requires: hicolor-icon-theme htmlview
%description
An emulator for a variety of Commodore 8bit machines, including the C16, C64,
C128, VIC-20, PET (all models, except SuperPET 9000), Plus-4, CBM-II
(aka C610)
%prep
%setup -q
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .tmpnam
%patch4 -p1 -z .mon
for i in man/*.1 doc/*.info*; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
mv $i.tmp $i
done
# not really needed, make sure these don't get used:
rm -f src/lib/*/*.c src/lib/*/*.h
%build
%configure --enable-gnomeui --enable-fullscreen --with-sdl
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name}
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# vice installs its docs under /usr/share/vice/doc, we install them ourselves
# with %doc, so nuke vice's install and create a symlink for the help function
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
for i in x128.desktop x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop \
xvic.desktop; do
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_SOURCE_DIR/$i
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
tar xvfj %{SOURCE7}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
tar xvfj %{SOURCE8}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
tar xvfj %{SOURCE9}
# remove "icon" from the icons name they are already in the icons dir.
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog FEEDBACK README doc/mon.txt doc/iec-bus.txt
%doc doc/html/*.html doc/html/images/* doc/html/plain/*
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/dribble-*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%{_infodir}/%{name}.info*
%{_mandir}/man1/*.1.gz
%changelog
* Wed Apr 25 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-3%{?dist}
- Further fixes to the xrand code to fix more crashes on exit (drb bz 87)
* Sun Apr 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-2%{?dist}
- Fix vice crashing with the latest libX11 update (dribble bz 91)
- Fix vice crashing on exit due to corrupted mem
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.21-1%{?dist}
- New upstream release 1.21
- Fixup .desktop file categories for games-menus usage
* Thu Mar 1 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-3%{?dist}
- Fix dribble bug 76
* Sun Oct 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-2%{?dist}
- Add a patch from upstream which fixes the black buttons / menu problem on FC5
* Sat Sep 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.20-1%{?dist}
- New upstream release 1.20
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-4%{?dist}
- add Patch3, which replaces tmpnam with tempnam and creates the tmpfiles
in a user owned dir fixing a tempfile security vulnerability.
* Fri Jun 23 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-3%{?dist}
- change --vendor fedora to --vendor dribble when installing .desktop files
- add %%{?dist} to release field in changelog
- add Patch2, which calls htmlview instead of netscape when accessing help.
- make BuildRequires conditonally Require modular or monolithic X using
%%{?fedora} to fix building on FC-4.
* Wed Jun 21 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-2
- convert manual and info pages to UTF8
* Tue Jun 20 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.19-1
- Initial Release, loosely based on the vice package by Ian Chapman
<ian.chapman(a)amiga-hardware.com>, the icons are from Mandrakes package.
--- NEW FILE x128.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X128 (Vice)
Comment=A Commodore 128 Emulator
Exec=x128
Icon=c128.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE x64.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=X64 (Vice)
Comment=A Commodore 64 Emulator
Exec=x64
Icon=c64.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xcbm-ii.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XCBM-II (Vice)
Comment=A CBM-II (C610) Emulator
Exec=xcbm2
Icon=c610.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xpet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPET (Vice)
Comment=A Commodore PET Emulator
Exec=xpet
Icon=pet.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xplus4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XPlus-4 (Vice)
Comment=A Commodore Plus-4 Emulator
Exec=xplus4
Icon=plus4.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE xvic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XVic (Vice)
Comment=A Commodore VIC-20 Emulator
Exec=xvic
Icon=vic20.png
Terminal=false
StartupNotify=true
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 16:12:38 -0000 1.1
+++ .cvsignore 25 Jul 2008 19:37:37 -0000 1.2
@@ -0,0 +1,4 @@
+vice-1.22.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 16:12:38 -0000 1.1
+++ sources 25 Jul 2008 19:37:37 -0000 1.2
@@ -0,0 +1,4 @@
+33204acbb74bafb12594d39b55888626 vice-1.22.tar.gz
+a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
+c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
+1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
16 years, 2 months
rpms/stella/devel stella.spec,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/stella/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20976
Modified Files:
stella.spec
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
- Release bump for rpmfusion
Index: stella.spec
===================================================================
RCS file: /cvs/free/rpms/stella/devel/stella.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stella.spec 13 Jun 2008 09:33:42 -0000 1.1
+++ stella.spec 25 Jul 2008 19:37:29 -0000 1.2
@@ -1,6 +1,6 @@
Name: stella
Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: Atari 2600 Video Computer System emulator
Group: Applications/Emulators
@@ -80,6 +80,9 @@
%changelog
+* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-2
+- Release bump for rpmfusion
+
* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.6.1-1
- New upstream release 2.6.1
16 years, 2 months