Author: musuruan
Update of /cvs/free/rpms/xroar/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15084
Modified Files:
.cvsignore sources xroar.spec
Removed Files:
xroar-0.23-SDL_sound.patch
Log Message:
* Sun Sep 12 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.24-1
- Upgrade to 0.24
- Cosmetic changes
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Dec 2009 13:09:45 -0000 1.4
+++ .cvsignore 12 Sep 2010 10:21:23 -0000 1.5
@@ -1,2 +1,2 @@
-xroar-0.23b.tar.gz
+xroar-0.24.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Dec 2009 13:09:45 -0000 1.4
+++ sources 12 Sep 2010 10:21:23 -0000 1.5
@@ -1,2 +1,2 @@
-0ba9e23c31b9aad6d62d2a6cac4ced2e xroar-0.23b.tar.gz
+2ed30f4ec8ef2c2e54ef25f7f8d95ce6 xroar-0.24.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/xroar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xroar.spec 8 Dec 2009 13:09:45 -0000 1.4
+++ xroar.spec 12 Sep 2010 10:21:24 -0000 1.5
@@ -1,5 +1,5 @@
Name: xroar
-Version: 0.23b
+Version: 0.24
Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
Group: Applications/Emulators
@@ -9,10 +9,7 @@
Source1:
http://www.6809.org.uk/dragon/dragon.rom
# Andrea Musuruane
Patch0: %{name}-0.23-info.patch
-# Upstream
-Patch1: %{name}-0.23-SDL_sound.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: ImageMagick
BuildRequires: jack-audio-connection-kit-devel
@@ -22,6 +19,7 @@
BuildRequires: SDL_image-devel
BuildRequires: ncurses-devel
BuildRequires: texinfo
+BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires(post): info
Requires(preun): info
@@ -38,14 +36,11 @@
%prep
-%setup -q -n %{name}-0.23
+%setup -q
# Fix info dir entry
%patch0 -p1
-# Fix SDL sound
-%patch1 -p1
-
%build
%configure
@@ -90,17 +85,21 @@
make install DEB_BUILD_OPTIONS=nostrip \
DESTDIR=%{buildroot}
+# Install ROM and icon
mkdir -p %{buildroot}%{_datadir}/{%{name}/roms,icons/hicolor/32x32/apps}
install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/roms/dragon-minifirm.rom
-desktop-file-install --vendor dribble \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
-
-desktop-file-install --vendor dribble \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}-minifirm.desktop
+# Install desktop files
+desktop-file-install \
+ --vendor dribble \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{name}.desktop
+
+desktop-file-install \
+ --vendor dribble \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{name}-minifirm.desktop
%clean
@@ -143,6 +142,10 @@
%changelog
+* Sun Sep 12 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.24-1
+- Upgrade to 0.24
+- Cosmetic changes
+
* Sat Dec 05 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.23b-1
- Upgrade to 0.23b
- Used an upstream patch to fix SDL sound
--- xroar-0.23-SDL_sound.patch DELETED ---