rpms/plus4emu/F-9 README_plus4emu.Fedora, NONE, 1.1 p4fliconv.desktop, NONE, 1.1 p4makecfg.desktop, NONE, 1.1 plus4emu-1.2.9-SConstruct.patch, NONE, 1.1 plus4emu.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 plus4emu.spec, 1.3, 1.4 sources, 1.4, 1.5 README_plus4emu.dribble, 1.1, NONE plus4emu-1.2.7-userpmopts.patch, 1.1, NONE

Fri Dec 26 19:35:29 CET 2008

Author: musuruan

Update of /cvs/nonfree/rpms/plus4emu/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15486

Modified Files:
	.cvsignore plus4emu.spec sources 
Added Files:
	README_plus4emu.Fedora p4fliconv.desktop p4makecfg.desktop 
	plus4emu-1.2.9-SConstruct.patch plus4emu.desktop 
Removed Files:
	README_plus4emu.dribble plus4emu-1.2.7-userpmopts.patch 
Log Message:
* Thu Dec 25 2008 Andrea Musuruane <musuruan at gmail.com> 1.2.9.2-1
- Updated to upstream 1.2.9.2
- Moved to RPM Fusion nonfree
- ROM images are now shippend in the source and therefore packaged
- Fixed sources to read ROM images from datadir
- Desktop files are no longer generated in the spec file
- Renamed README.dribble in README.Fedora

--- NEW FILE README_plus4emu.Fedora ---
README for plus4emu
===================

Starting with version 1.2.9, ROMS are distributed with the RPM. The are 
installed in the /usr/share/plus4emu/roms directory.

When you run the p4makecfg utility to install or reinstall plus4emu 
configuration files, the ROM image directory will be set to the aforementioned
directory.



--- NEW FILE p4fliconv.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu FLI Converter
Comment=High resolution interlaced FLI converter utility
Exec=p4fliconv
Icon=plus4emu
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;



--- NEW FILE p4makecfg.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu config
Comment=Reinstall Plus4emu configuration files
Exec=p4makecfg
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;


plus4emu-1.2.9-SConstruct.patch:

--- NEW FILE plus4emu-1.2.9-SConstruct.patch ---
diff -dur plus4emu-1.2.9.orig/SConstruct plus4emu-1.2.9/SConstruct
--- plus4emu-1.2.9.orig/SConstruct	2008-08-27 15:32:45.000000000 +0200
+++ plus4emu-1.2.9/SConstruct	2008-08-28 05:37:35.000000000 +0200
@@ -1,5 +1,6 @@
 # vim: syntax=python
 
+import os
 import sys
 
 win32CrossCompile = 0
@@ -10,17 +11,7 @@
 enableDebug = 0
 buildRelease = 1
 
-compilerFlags = ''
-if buildRelease:
-    if linux32CrossCompile or win32CrossCompile:
-        compilerFlags = ' -march=pentium2 -mtune=generic '
-if enableDebug and not buildRelease:
-    compilerFlags = ' -Wno-long-long -Wshadow -g -O2 ' + compilerFlags
-    compilerFlags = ' -Wall -W -ansi -pedantic ' + compilerFlags
-else:
-    compilerFlags = ' -Wall -O3 ' + compilerFlags
-    compilerFlags = compilerFlags + ' -fno-inline-functions '
-    compilerFlags = compilerFlags + ' -fomit-frame-pointer -ffast-math '
+compilerFlags = os.environ['CXXFLAGS']
 
 fltkConfig = 'fltk-config'
 


--- NEW FILE plus4emu.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu
GenericName=Commodore 264 series emulator
Comment=Portable emulator of the Commodore 264 family of computers
Exec=plus4emu
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2008 17:47:48 -0000	1.4
+++ .cvsignore	26 Dec 2008 18:35:28 -0000	1.5
@@ -1,2 +1 @@
-plus4emu-1.2.8.tar.bz2
-plus4emu-1.2.8.1.tar.bz2
+plus4emu-1.2.9.2.tar.bz2


Index: plus4emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/plus4emu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plus4emu.spec	24 Jul 2008 17:47:48 -0000	1.3
+++ plus4emu.spec	26 Dec 2008 18:35:28 -0000	1.4
@@ -1,5 +1,7 @@
+%define binprefix p4
+
 Name:           plus4emu
-Version:        1.2.8.1
+Version:        1.2.9.2
 Release:        1%{?dist}
 Summary:        Portable emulator of the Commodore 264 family of computers
 Group:          Applications/Emulators
@@ -7,8 +9,11 @@
 URL:            http://plus4emu.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.png
-Source2:        README_%{name}.dribble
-Patch0:         %{name}-1.2.7-userpmopts.patch
+Source2:        README_%{name}.Fedora
+Source3:        %{name}.desktop
+Source4:        p4fliconv.desktop
+Source5:        %{binprefix}makecfg.desktop
+Patch0:         %{name}-1.2.9-SConstruct.patch
 Patch1:         %{name}-1.2.5-fixpathissue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
@@ -28,51 +33,52 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 
-# Insert the compiler optflags
-sed -i 's|insertrpmflags|%{optflags}|' SConstruct
-
 # Fix EOL chars
 sed -i 's/\r//' README NEWS
 
 # Rename makecfg to a less generic name to avoid possible conflicts
-sed -i 's|makecfg|%{name}-makecfg|' gui/main.cpp README
+sed -i 's|makecfg|%{binprefix}makecfg|' gui/main.cpp README
+
+# Rename compress to a less generic name to avoid possible conflicts
+sed -i 's|compress -|%{binprefix}compress -|' README
+
+# ROM images are in datadir
+sed -i 's|installDirectory + "roms"|"%{_datadir}/%{name}/roms"|' installer/makecfg.cpp
 
 
 %build
+export CXXFLAGS="%{optflags}"
 scons %{?_smp_mflags}
 
-# Build desktop icon
-cat >%{name}.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=Plus4emu
-GenericName=Commodore 264 series emulator
-Comment=%{summary}
-Exec=%{name}
-Icon=%{name}
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Game;Emulator;
-EOF
-
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm0644 %{SOURCE2} README.dribble
-install -pm0755 plus4emu tapconv %{buildroot}%{_bindir}
-install -pm0755 makecfg %{buildroot}%{_bindir}/%{name}-makecfg
+install -pm0644 %{SOURCE2} README.Fedora
+install -pm0755 p4fliconv p4sconv plus4emu tapconv %{buildroot}%{_bindir}
+install -pm0755 makecfg %{buildroot}%{_bindir}/%{binprefix}makecfg
+install -pm0755 compress %{buildroot}%{_bindir}/%{binprefix}compress
 
 desktop-file-install --vendor dribble \
                      --dir %{buildroot}%{_datadir}/applications \
-                     %{name}.desktop
+                     %{SOURCE3}
 
+desktop-file-install --vendor '' \
+                     --dir %{buildroot}%{_datadir}/applications \
+                     %{SOURCE4}
+
+desktop-file-install --vendor '' \
+                     --dir %{buildroot}%{_datadir}/applications \
+                     %{SOURCE5}
+
+# install ROM images
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
+install -pm0644 roms/* %{buildroot}%{_datadir}/%{name}/roms
 
 %clean
 rm -rf %{buildroot}
@@ -95,12 +101,23 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/applications/dribble-%{name}.desktop
-%doc README COPYING NEWS README.dribble
+%{_datadir}/applications/p4fliconv.desktop
+%{_datadir}/applications/%{binprefix}makecfg.desktop
+%doc README COPYING NEWS README.Fedora
 
 
 %changelog
+* Thu Dec 25 2008 Andrea Musuruane <musuruan at gmail.com> 1.2.9.2-1
+- Updated to upstream 1.2.9.2
+- Moved to RPM Fusion nonfree
+- ROM images are now shippend in the source and therefore packaged
+- Fixed sources to read ROM images from datadir
+- Desktop files are no longer generated in the spec file
+- Renamed README.dribble in README.Fedora
+
 * Thu Jul 24 2008 Andrea Musuruane <musuruan at gmail.com> 1.2.8.1-1
 - Updated to upstream 1.2.8.1
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jul 2008 17:47:48 -0000	1.4
+++ sources	26 Dec 2008 18:35:28 -0000	1.5
@@ -1,2 +1 @@
-0a49767a02346bc5f21e28ae2359e231  plus4emu-1.2.8.tar.bz2
-d620079cf7422a1370489ac26fd7fc8c  plus4emu-1.2.8.1.tar.bz2
+3b71aed343a341f62e688dd5bc5b9d1f  plus4emu-1.2.9.2.tar.bz2


--- README_plus4emu.dribble DELETED ---


--- plus4emu-1.2.7-userpmopts.patch DELETED ---

