rpms/bsnes/F-9 .cvsignore, 1.4, 1.5 bsnes-0.037a-strip.patch, 1.1, 1.2 bsnes.spec, 1.4, 1.5 sources, 1.4, 1.5 bsnes.desktop, 1.1, NONE

[Julian Sikorski]

Author: belegdol

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

Modified Files:
	.cvsignore bsnes-0.037a-strip.patch bsnes.spec sources 
Removed Files:
	bsnes.desktop 
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
- Updated to 0.040
- The desktop file now comes with the tarball
- Icon is now installed to %{_datadir}/pixmaps
- The Qt ui is only built when it is legal to do so
- Updated the strip patch
- Fixed the last %changelog entry



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jan 2009 20:35:02 -0000	1.4
+++ .cvsignore	9 Mar 2009 18:14:20 -0000	1.5
@@ -1 +1 @@
-bsnes_v039.tar.bz2
+bsnes_v040.tar.bz2

bsnes-0.037a-strip.patch:

Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes-0.037a-strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsnes-0.037a-strip.patch	4 Dec 2008 23:37:27 -0000	1.1
+++ bsnes-0.037a-strip.patch	9 Mar 2009 18:14:20 -0000	1.2
@@ -1,10 +1,10 @@
---- src/Makefile.strip	2008-10-17 14:35:28.000000000 +0200
-+++ src/Makefile	2008-11-27 14:28:51.000000000 +0100
-@@ -11,7 +11,6 @@
-   cpp = $(subst cc,++,$(compiler)) $(flags)
+--- src/Makefile.strip	2009-02-22 10:13:58.000000000 +0100
++++ src/Makefile	2009-02-22 12:18:50.000000000 +0100
+@@ -13,7 +13,6 @@
+   cpp = $(subst cc,++,$(compiler))
    obj = o
    rule = -c $< -o $@
 -  link = -s
    mkbin = -o$1
    mkdef = -D$1
-   mklib = -l$1
+   mkinc = -I$1


Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes.spec	20 Jan 2009 20:35:02 -0000	1.4
+++ bsnes.spec	9 Mar 2009 18:14:20 -0000	1.5
@@ -1,4 +1,4 @@
-%define vernumber 039
+%define vernumber 040
 
 Name:           bsnes
 Version:        0.%{vernumber}
@@ -9,7 +9,6 @@
 License:        Redistributable, no modification permitted
 URL:            http://byuu.cinnamonpirate.com/?page=bsnes
 Source0:        http://byuu.cinnamonpirate.com/files/%{name}_v%{vernumber}.tar.bz2
-Source1:        bsnes.desktop
 Source2:        README.bsnes
 Patch0:         bsnes-0.037a-strip.patch
 Patch1:         bsnes-system-zlib.patch
@@ -20,16 +19,18 @@
 #isn't available when the library is built stand alone
 BuildRequires:  desktop-file-utils
 BuildRequires:  freealut-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  libao-devel     
 BuildRequires:  libXv-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  minizip-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  SDL-devel
-
-#libco, which is used by bsnes, only supports these
-ExclusiveArch:  i386 x86_64
+#Qt >= 4.5 is required for legal reasons
+%if 0%{?fedora} >= 11
+BuildRequires:  qt-devel >= 1:4.5.0-1%{?dist}
+%else
+BuildRequires:  gtk2-devel
+%endif
 
 %description
 bsnes is an emulator that began development on 2004-10-14. The purpose of the
@@ -50,7 +51,7 @@
 find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
 
 #use system optflags
-sed -i "s#flags = -O3#flags = %{optflags}#" src/Makefile
+sed -i "s#flags = -O3#flags = $RPM_OPT_FLAGS#" src/Makefile
 
 #install fedora-specific readme
 install -pm 644 %{SOURCE2} README.Fedora
@@ -58,7 +59,13 @@
 
 %build
 pushd src
-make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true
+%if 0%{?fedora} >= 11
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+        moc=moc-qt4
+%else
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+        ui=ui_hiro
+%endif
 
 
 %install
@@ -66,7 +73,8 @@
 pushd src
 make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}      
 desktop-file-install --vendor=rpmfusion \
-       --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+        --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
 
 
 %clean
@@ -77,11 +85,23 @@
 %defattr(-,root,root,-)
 %doc README.Fedora
 %{_bindir}/bsnes
-%{_datadir}/icons/bsnes.png
+%{_datadir}/pixmaps/bsnes.png
 %{_datadir}/applications/rpmfusion-bsnes.desktop
 
 
 %changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
+- Updated to 0.040
+- The desktop file now comes with the tarball
+- Icon is now installed to %%{_datadir}/pixmaps
+- The Qt ui is only built when it is legal to do so
+- Updated the strip patch
+- Fixed the last %%changelog entry
+
+* Sun Feb 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-2
+- Dropped the ExclusiveArch, libco has a C fallback
+- Use macros consistently
+
 * Tue Jan 20 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-1
 - Updated to 0.039
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Jan 2009 20:35:02 -0000	1.4
+++ sources	9 Mar 2009 18:14:20 -0000	1.5
@@ -1 +1 @@
-131a72097a90fc8cd614dc1dd4e0cc72  bsnes_v039.tar.bz2
+763e4ecd9b4b78432d70e1572f73efdb  bsnes_v040.tar.bz2


--- bsnes.desktop DELETED ---