4:53 p.m.
Author: musuruan
Update of /cvs/free/rpms/xroar/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18340
Modified Files:
.cvsignore sources xroar.spec
Added Files:
xroar-0.28-lm.patch
Removed Files:
xroar-0.27-lm.patch
Log Message:
* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
- Upgrade to 0.28
- Use converted macosx icons
xroar-0.28-lm.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xroar-0.28-lm.patch ---
diff -durN xroar-0.28/Makefile xroar-0.28-lm/Makefile
--- xroar-0.28/Makefile 2012-05-12 09:01:33.000000000 +0200
+++ xroar-0.28-lm/Makefile 2012-05-13 10:44:42.265766639 +0200
@@ -335,7 +335,7 @@
-I$(CURDIR) -I$(SRCROOT) $(WARN) \
-DVERSION=\"$(VERSION)\" \
-DROMPATH=$(ROMPATH) -DCONFPATH=$(CONFPATH)
-xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS)
+xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS) -lm
portalib_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
-I$(CURDIR) -I$(SRCROOT) $(WARN)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 Oct 2011 13:27:50 -0000 1.8
+++ .cvsignore 13 May 2012 16:53:36 -0000 1.9
@@ -1,2 +1,2 @@
-xroar-0.27.tar.gz
+xroar-0.28.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 1 Oct 2011 13:27:50 -0000 1.8
+++ sources 13 May 2012 16:53:37 -0000 1.9
@@ -1,2 +1,2 @@
-b1143058297fc44b1348d5b9d82b0c5f xroar-0.27.tar.gz
+0cdc25986ed4e3352fba42bf4c6d99cb xroar-0.28.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/xroar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xroar.spec 8 Feb 2012 22:12:28 -0000 1.11
+++ xroar.spec 13 May 2012 16:53:38 -0000 1.12
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.27
-Release: 3%{?dist}
+Version: 0.28
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
Group: Applications/Emulators
License: GPLv2+
@@ -8,7 +8,7 @@
Source0: http://www.6809.org.uk/dragon/%{name}-%{version}.tar.gz
Source1: http://www.6809.org.uk/dragon/dragon.rom
# Hans de Goede
-Patch0: %{name}-0.27-lm.patch
+Patch0: %{name}-0.28-lm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -17,7 +17,7 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: texinfo
BuildRequires: texinfo-tex
-BuildRequires: ImageMagick
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires(post): info
@@ -48,9 +48,6 @@
make doc/xroar.html
make doc/xroar.pdf
-# Create icon
-convert gp32/icon.bmp -transparent '#000000' %{name}.png
-
# Generate desktop file
cat >%{name}.desktop <<EOF
[Desktop Entry]
@@ -82,11 +79,20 @@
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 ROM
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/roms/dragon-minifirm.rom
+# Extract Mac OS X icons
+icns2png -x macosx/%{name}.icns
+
+# Install icons
+for i in 16 32 48 128; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 %{name}_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
+
# Install desktop files
desktop-file-install \
--vendor dribble \
@@ -130,7 +136,7 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/applications/dribble-%{name}-minifirm.desktop
%{_infodir}/%{name}.info*
@@ -139,6 +145,10 @@
%changelog
+* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
+- Upgrade to 0.28
+- Use converted macosx icons
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--- xroar-0.27-lm.patch DELETED ---