2:02 p.m.
Author: musuruan
Update of /cvs/nonfree/rpms/yapeSDL/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28484
Modified Files:
.cvsignore sources yapeSDL.spec
Added Files:
Plus4.png yapeSDL-0.32.5-cflags.patch
yapeSDL-0.32.5-homedir.patch yapeSDL.desktop
Removed Files:
yapeSDL-0.32.4-gcc4_cflags.patch yapeSDL-0.32.4-homedir.patch
yapeSDL-0.32.4-loadfile.patch
Log Message:
* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
- Updated to upstream 0.32.5
- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
- Removed the name from the summary
yapeSDL-0.32.5-cflags.patch:
--- NEW FILE yapeSDL-0.32.5-cflags.patch ---
--- Makefile.orig 2008-12-01 12:15:43.000000000 +0100
+++ Makefile 2008-12-01 12:16:38.000000000 +0100
@@ -24,7 +24,7 @@
sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h
CC = g++
-cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config
--cflags`
+cflags = $(RPM_OPT_FLAGS) -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config
--cflags`
libs = `sdl-config --libs`
#SDL_CFLAGS := $(shell sdl-config --cflags)
yapeSDL-0.32.5-homedir.patch:
--- NEW FILE yapeSDL-0.32.5-homedir.patch ---
--- archdep.cpp.orig 2008-12-01 12:19:01.000000000 +0100
+++ archdep.cpp 2008-12-01 12:19:50.000000000 +0100
@@ -75,7 +75,7 @@
int ad_makedirs(char *path)
{
strcpy(temp,path);
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
CreateDirectory(temp, NULL);
return 1;
@@ -296,7 +296,7 @@
// Possible buffer overflow fixed.
strncpy(temp, path, 512);
if (strlen(temp) > 506) return 0;
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
mkdir(temp, 0777);
return 1;
@@ -307,7 +307,7 @@
// Possible buffer overflow fixed.
strncpy(temp, tmpchr, 512);
if (strlen(temp) > 496) return NULL;
- strcat( temp, "/yape/yape.conf");
+ strcat( temp, "/.yape/yape.conf");
return temp;
}
--- README.SDL.orig 2008-12-01 12:19:59.000000000 +0100
+++ README.SDL 2008-12-01 12:20:34.000000000 +0100
@@ -80,7 +80,7 @@
LALT + W : toggle between unlimited speed and 50 Hz frame rate (original speed)
Internal disk LOAD/SAVE operations are supported to the current
- file system directory, which is usually '/home/<username>/yape'.
+ file system directory, which is usually '/home/<username>/.yape'.
Any PRG files you may wish to load, should go there, although you can browse the
directory tree
from the user interface, too.
--- NEW FILE yapeSDL.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=YapeSDL
Comment=Yet another plus/4 emulator
Exec=yape
Icon=yapeSDL
Terminal=false
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Jul 2008 14:18:00 -0000 1.2
+++ .cvsignore 3 Dec 2008 14:02:20 -0000 1.3
@@ -1 +1 @@
-yapeSDL-0.32.4.tar.gz
+yapeSDL-0.32.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Jul 2008 14:18:00 -0000 1.2
+++ sources 3 Dec 2008 14:02:20 -0000 1.3
@@ -1 +1 @@
-b2b7a180d2c7893805f820f80f59ad30 yapeSDL-0.32.4.tar.gz
+2d37d720975dc6a0fd9ec4e7964cafb1 yapeSDL-0.32.5.tar.gz
Index: yapeSDL.spec
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/yapeSDL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yapeSDL.spec 26 Jul 2008 14:18:00 -0000 1.1
+++ yapeSDL.spec 3 Dec 2008 14:02:20 -0000 1.2
@@ -1,21 +1,28 @@
Name: yapeSDL
-Version: 0.32.4
-Release: 2%{?dist}
-Summary: YAPE, yet another plus/4 emulator
+Version: 0.32.5
+Release: 1%{?dist}
+Summary: Yet another plus/4 emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://yape.plus4.net/
Source: http://yape.homeserver.hu/download/%{name}-%{version}.tar.gz
-# OpenSUSE
-Patch0: %{name}-0.32.4-gcc4_cflags.patch
-# FreeBSD
-Patch1: %{name}-0.32.4-homedir.patch
+Source1: %{name}.desktop
+# Icon taken from
+# http://ahlberg.deviantart.com/art/Commodore-Icons-70563314
+# License:
+# These icons are FREE! Feel free to use them in your applications,
+# on your site, signature on a forum or whatever.
+Source2: Plus4.png
# Andrea Musuruane
-Patch2: %{name}-0.32.4-loadfile.patch
+Patch0: %{name}-0.32.5-cflags.patch
+Patch1: %{name}-0.32.5-homedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 0:1.2
+BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
+
%description
YAPE is a rather decent plus/4 emulator. It has been developed for
@@ -26,18 +33,17 @@
%prep
%setup -q -c -n %{name}-%{version}
%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%patch1 -p0
# Fix end-of-line-encoding
-sed -i 's/\r//' *.{cpp,h} Changes README.SDL copying
+sed -i 's/\r//' *.{cpp,h} Changes README.SDL COPYING
# Fix UTF-8 encoding
iconv --from=ISO-8859-1 --to=UTF-8 README.SDL > README.SDL.utf8
mv README.SDL.utf8 README.SDL
# Fix spurious executable permissions
-chmod 644 *.{cpp,h} Changes README.SDL copying
+chmod 644 *.{cpp,h} Changes README.SDL COPYING
%build
@@ -49,6 +55,30 @@
install -d -m 0755 %{buildroot}%{_bindir}
install -m 0755 yape %{buildroot}%{_bindir}/
+# install desktop file
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE1}
+
+# install icon
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+cp %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+
+
+%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
+
%clean
rm -rf %{buildroot}
@@ -56,11 +86,17 @@
%files
%defattr(-,root,root,-)
-%doc Changes copying README.SDL
-%defattr(-,root,root,0755)
%{_bindir}/yape
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%doc Changes COPYING README.SDL
%changelog
+* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
+- Updated to upstream 0.32.5
+- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
+- Removed the name from the summary
+
* Tue Feb 26 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.4-2
- Minor cleanup
--- yapeSDL-0.32.4-gcc4_cflags.patch DELETED ---
--- yapeSDL-0.32.4-homedir.patch DELETED ---
--- yapeSDL-0.32.4-loadfile.patch DELETED ---
