Author: belegdol Update of /cvs/free/rpms/bsnes/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5070 Modified Files: .cvsignore bsnes.spec sources Added Files: bsnes-0.085-systemwide.patch Removed Files: bsnes-0.084-systemwide.patch Log Message: * Tue Jan 03 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.085-1 - Updated to 0.085 - Updated the systemwide patch - cheats.bml → cheats.xml bsnes-0.085-systemwide.patch: Makefile | 3 --- general/main-window.cpp | 4 ++-- tools/cheat-database.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) --- NEW FILE bsnes-0.085-systemwide.patch --- diff -up bsnes_v085-source/bsnes/ui/general/main-window.cpp.systemwide bsnes_v085-source/bsnes/ui/general/main-window.cpp --- bsnes_v085-source/bsnes/ui/general/main-window.cpp.systemwide 2011-12-11 18:40:56.000000000 +0100 +++ bsnes_v085-source/bsnes/ui/general/main-window.cpp 2012-01-03 19:57:44.770296862 +0100 @@ -332,7 +332,7 @@ void MainWindow::synchronize() { } void MainWindow::setupVideoFilters() { - string path = { application->basepath, "filters/" }; + string path = { "/usr/lib/bsnes/filters/" }; lstring files = directory::files(path, "*.filter"); if(files.size() == 0) { path = { application->userpath, "filters/" }; @@ -363,7 +363,7 @@ void MainWindow::setupVideoFilters() { } void MainWindow::setupVideoShaders() { - string path = { application->basepath, "shaders/" }; + string path = { "/usr/share/bsnes/shaders/" }; lstring files = directory::files(path, { "*.", config->video.driver, ".shader" }); if(files.size() == 0) { path = { application->userpath, "shaders/" }; diff -up bsnes_v085-source/bsnes/ui/Makefile.systemwide bsnes_v085-source/bsnes/ui/Makefile --- bsnes_v085-source/bsnes/ui/Makefile.systemwide 2011-12-30 07:01:55.000000000 +0100 +++ bsnes_v085-source/bsnes/ui/Makefile 2012-01-03 19:59:35.298641852 +0100 @@ -67,11 +67,8 @@ endif install: ifeq ($(platform),x) install -D -m 755 out/$(name) $(DESTDIR)$(prefix)/bin/$(name) - mkdir -p ~/.config/$(name) install -D -m 644 data/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png install -D -m 644 data/$(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop - cp data/cheats.xml ~/.config/$(name)/cheats.xml - chmod 777 ~/.config/$(name) ~/.config/$(name)/cheats.xml endif uninstall: diff -up bsnes_v085-source/bsnes/ui/tools/cheat-database.cpp.systemwide bsnes_v085-source/bsnes/ui/tools/cheat-database.cpp --- bsnes_v085-source/bsnes/ui/tools/cheat-database.cpp.systemwide 2011-12-31 09:05:26.000000000 +0100 +++ bsnes_v085-source/bsnes/ui/tools/cheat-database.cpp 2012-01-03 20:02:23.651120923 +0100 @@ -34,7 +34,7 @@ void CheatDatabase::findCodes() { cheatCode.reset(); string data; - data.readfile(application->path("cheats.xml")); + data.readfile("/usr/share/bsnes/cheats.xml"); XML::Document document(data); for(auto &node : document["database"]) { if(node.name != "cartridge") continue; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bsnes/F-15/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 9 Nov 2011 22:49:29 -0000 1.33 +++ .cvsignore 3 Jan 2012 19:20:52 -0000 1.34 @@ -1 +1 @@ -bsnes_v084-source.tar.bz2 +bsnes_v085-source.tar.bz2 Index: bsnes.spec =================================================================== RCS file: /cvs/free/rpms/bsnes/F-15/bsnes.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- bsnes.spec 9 Nov 2011 22:49:29 -0000 1.44 +++ bsnes.spec 3 Jan 2012 19:20:52 -0000 1.45 @@ -1,4 +1,4 @@ -%global vernumber 084 +%global vernumber 085 Name: bsnes Version: 0.%{vernumber} @@ -10,7 +10,7 @@ URL: http://byuu.org/bsnes/ Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2 Source2: README.bsnes -Patch1: bsnes-0.084-systemwide.patch +Patch1: bsnes-0.085-systemwide.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #bsnes does not use system snes_ntsc because the modified video processing @@ -39,7 +39,7 @@ %prep -%setup -qcn %{name}_v%{vernumber}-source +%setup -qn %{name}_v%{vernumber}-source %patch1 -p1 -b .systemwide #fix permissions @@ -86,7 +86,7 @@ $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop popd install -d $RPM_BUILD_ROOT%{_datadir}/%{name} -install -pm 644 bsnes/data/cheats.bml $RPM_BUILD_ROOT%{_datadir}/%{name} +install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name} install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir} @@ -109,6 +109,11 @@ %changelog +* Tue Jan 03 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.085-1 +- Updated to 0.085 +- Updated the systemwide patch +- cheats.bml → cheats.xml + * Wed Nov 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.084-1 - Updated to 0.084 - License is now GPLv3 Index: sources =================================================================== RCS file: /cvs/free/rpms/bsnes/F-15/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 9 Nov 2011 22:49:29 -0000 1.33 +++ sources 3 Jan 2012 19:20:52 -0000 1.34 @@ -1 +1 @@ -ba66a8aa91b8f17812cc91ffeb63e489 bsnes_v084-source.tar.bz2 +2419710087ba28c894e5aa1c3c41b6e7 bsnes_v085-source.tar.bz2 --- bsnes-0.084-systemwide.patch DELETED ---