Author: musuruan Update of /cvs/free/rpms/Nestopia/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12849 Modified Files: .cvsignore Nestopia.spec sources Added Files: Nestopia-1.45-format-security.patch Nestopia-1.45-install-location.patch Removed Files: Nestopia-1.40-fixmakefile.patch Nestopia.desktop nestopia.sh Log Message: * Thu Oct 31 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.45-1 - Switch to upstream by R. Danbrook - Added two patches from Debian - Updated %description - Dropped desktop vendor tag for F-19+ - Dropped obsolete Group, Buildroot, %clean and %defattr - Dropped cleaning at the beginning of %install Nestopia-1.45-format-security.patch: gtkui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE Nestopia-1.45-format-security.patch --- Description: Use a format specifier with gtk_message_dialog_new Author: Stephen Kitt <skitt(a)debian.org&gt; --- a/source/unix/gtkui.cpp +++ b/source/unix/gtkui.cpp @@ -1348,7 +1348,7 @@ } void create_messagewindow(char* message) { - messagewindow = gtk_message_dialog_new(GTK_WINDOW(mainwindow), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, message); + messagewindow = gtk_message_dialog_new(GTK_WINDOW(mainwindow), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message); gtk_dialog_run (GTK_DIALOG (messagewindow)); gtk_widget_destroy (messagewindow); } Nestopia-1.45-install-location.patch: Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) --- NEW FILE Nestopia-1.45-install-location.patch --- Description: Install to FHS-compliant locations and handle DESTDIR Author: Stephen Kitt <skitt(a)debian.org&gt; --- nestopia.orig/Makefile +++ nestopia/Makefile @@ -4,8 +4,8 @@ # By R. Danbrook 2012 # -CC = @gcc -CXX = @g++ +CC = gcc +CXX = g++ CFLAGS ?= -O3 -g3 CXXFLAGS ?= -O3 -g3 CPPFLAGS += -DNST_PRAGMA_ONCE_SUPPORT -D_SZ_ONE_DIRECTORY @@ -36,8 +36,8 @@ CPPFLAGS += -DBSD endif -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin +PREFIX = /usr +BINDIR = $(PREFIX)/bin DATADIR = $(PREFIX)/share/nestopia # OpenGL Support @@ -190,15 +190,16 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $^ $(LIBS) install: - mkdir -p $(DATADIR)/icons - mkdir -p $(PREFIX)/share/pixmaps - install -m 0755 $(BIN) $(BINDIR) - install -m 0644 source/unix/icons/nestopia.desktop $(DATADIR) - install -m 0644 NstDatabase.xml $(DATADIR) - install -m 0644 source/unix/icons/*.png $(DATADIR)/icons - install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons - install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps - xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop + mkdir -p $(DESTDIR)/$(BINDIR) + mkdir -p $(DESTDIR)/$(PREFIX)/share/applications + mkdir -p $(DESTDIR)/$(DATADIR)/icons + mkdir -p $(DESTDIR)/$(PREFIX)/share/pixmaps + install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR) + install -m 0644 source/unix/icons/nestopia.desktop $(DESTDIR)/$(PREFIX)/share/applications + install -m 0644 NstDatabase.xml $(DESTDIR)/$(DATADIR) + install -m 0644 source/unix/icons/*.png $(DESTDIR)/$(DATADIR)/icons + install -m 0644 source/unix/icons/*.svg $(DESTDIR)/$(DATADIR)/icons + install -m 0644 source/unix/icons/nestopia.svg $(DESTDIR)/$(PREFIX)/share/pixmaps uninstall: xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/Nestopia/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Oct 2008 16:55:46 -0000 1.3 +++ .cvsignore 4 Nov 2013 14:44:07 -0000 1.4 @@ -1,2 +1 @@ -Nestopia140src.zip -nst140_lnx_release_h.zip +nestopia-1.45.tgz Index: Nestopia.spec =================================================================== RCS file: /cvs/free/rpms/Nestopia/devel/Nestopia.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Nestopia.spec 3 Mar 2013 21:45:02 -0000 1.8 +++ Nestopia.spec 4 Nov 2013 14:44:07 -0000 1.9 @@ -1,30 +1,29 @@ -%define pkgversion %(echo %version|sed s/[a-z]//g|sed s/\\\\.//) -%define pkgrelease %(echo %version|sed s/[^a-z]//g) +%global realname nestopia Name: Nestopia -Version: 1.40h -Release: 7%{?dist} +Version: 1.45 +Release: 1%{?dist} Summary: A portable open source NES/Famicom emulator -Group: Applications/Emulators License: GPLv2+ -URL: http://nestopia.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/nestopia/%{name}%{pkgversion}src.zip -# Source1 is not downloadable without a valid browser user agent -Source1: http://rbelmont.mameworld.info/nst%{pkgversion}_lnx_release_%{pkgrelease}... -Source2: Nestopia.desktop -Source3: nestopia.sh -Patch0: Nestopia-1.40-fixmakefile.patch -Patch1: Nestopia-1.36-nesntsc.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://0ldsk00l.ca/nestopia.html +Source0: http://downloads.sourceforge.net/nestopiaue/%{version}/%{realname}-%{vers... +# Install to FHS-compliant locations and handle DESTDIR +Patch0: %{name}-1.45-install-location.patch +# Use a format specifier with gtk_message_dialog_new +Patch1: %{name}-1.45-format-security.patch +# Use system nes_ntsc +Patch2: Nestopia-1.36-nesntsc.patch -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk3-devel BuildRequires: SDL-devel >= 1.2.12 BuildRequires: alsa-lib-devel +BuildRequires: libarchive-devel BuildRequires: zlib-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel BuildRequires: nes_ntsc-devel BuildRequires: pkgconfig -BuildRequires: ImageMagick BuildRequires: desktop-file-utils Requires: hicolor-icon-theme @@ -34,79 +33,48 @@ peripherals. The hardware is emulated at cycle-by-cycle granularity, ensuring full support for software that do mid-scanline and other timing trickery. -Linux porting by R. Belmont. - %prep -%setup -q -c -%setup -q -T -D -a 1 +%setup -q -n %{realname}-%{version} %patch0 -p1 -%patch1 -p0 +%patch1 -p1 +%patch2 -p0 # Fix end-of-line encoding sed -i 's/\r//' changelog.txt -sed -i 's/\r//' source/linux/7zip/* - -# Fix file permissions -chmod 644 source/linux/7zip/* -# Compile with system zlib -sed -i 's/\"..\/zlib\/zlib.h\"/\<zlib.h\>/' source/core/NstZlib.cpp +# Clean up sources +rm -rf dll lib source/kaillera source/unrar %build +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" # It does not compile with smp_mflags -make RPMFLAGS="-c $RPM_OPT_FLAGS" +make %install -rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -# Install main executable -install -d %{buildroot}%{_bindir} -install -m 755 nst %{buildroot}%{_bindir} - -# Install data files -install -d %{buildroot}%{_datadir}/%{name} -install -m 644 {nstcontrols,NstDatabase.xml} %{buildroot}%{_datadir}/%{name} - -# Install wrapper script -install -m 755 %{SOURCE3} %{buildroot}%{_bindir} - -# Install desktop file -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --vendor dribble \ - --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE2} - -# Install icon -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -convert source/win32/resource/window.ico \ - %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/Nestopia.png - -%clean -rm -rf %{buildroot} - -%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 +# Validate desktop file +desktop-file-validate \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{realname}.desktop %files -%defattr(-,root,root) -%{_bindir}/nst -%{_bindir}/nestopia.sh -%{_datadir}/%{name} -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/applications/dribble-%{name}.desktop -%doc changelog.txt COPYING README.Linux readme.html +%{_bindir}/%{realname} +%{_datadir}/%{realname} +%{_datadir}/pixmaps/%{realname}.svg +%{_datadir}/applications/%{realname}.desktop +%doc changelog.txt COPYING README.unix readme.html %changelog +* Thu Oct 31 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.45-1 +- Switch to upstream by R. Danbrook +- Added two patches from Debian +- Updated %%description +- Dropped desktop vendor tag for F-19+ +- Dropped obsolete Group, Buildroot, %%clean and %%defattr +- Dropped cleaning at the beginning of %%install + * Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.40h-7 - Mass rebuilt for Fedora 19 Features @@ -125,7 +93,7 @@ * Thu Dec 04 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.40h-2 - Fixed unowned directory (BZ #216) -* Sun Oct 25 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.40h-1 +* Sun Oct 26 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.40h-1 - updated to 1.40 release h * Tue Jul 15 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.40g-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/Nestopia/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Oct 2008 16:55:46 -0000 1.3 +++ sources 4 Nov 2013 14:44:07 -0000 1.4 @@ -1,2 +1 @@ -526c99a06d2b257135e7047b0ed95ae0 Nestopia140src.zip -f9a9a905bada67e11dac1364612d0b35 nst140_lnx_release_h.zip +efef045895b8eaa78ed537dbb17c04f7 nestopia-1.45.tgz --- Nestopia-1.40-fixmakefile.patch DELETED --- --- Nestopia.desktop DELETED --- --- nestopia.sh DELETED ---