Author: jwrdegoede Update of /cvs/free/rpms/fakenes/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv30529 Modified Files: fakenes.spec Added Files: fakenes-0.5.9-beta3-allegro44-build.patch fakenes-0.5.9-beta3-libm-build.patch Log Message: * Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 0.5.9-0.3.beta3 - Fix building with allegro-4.4.x (rf#1969) - Fix the broken icon fakenes-0.5.9-beta3-allegro44-build.patch: alleggl.cbd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE fakenes-0.5.9-beta3-allegro44-build.patch --- diff -up fakenes-0.5.9-beta3/build/alleggl.cbd~ fakenes-0.5.9-beta3/build/alleggl.cbd --- fakenes-0.5.9-beta3/build/alleggl.cbd~ 2006-10-03 11:06:27.000000000 +0200 +++ fakenes-0.5.9-beta3/build/alleggl.cbd 2011-12-10 20:31:48.906063273 +0100 @@ -22,9 +22,9 @@ CFLAGS += ' -DUSE_ALLEGROGL' # -- -LIBAGL = agl +LIBAGL = alleggl -ifopt debug LIBAGL = 'agld' +ifopt debug LIBAGL = 'alleggld' AGL_LIBS = "-l${LIBAGL} " fakenes-0.5.9-beta3-libm-build.patch: default.cbd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fakenes-0.5.9-beta3-libm-build.patch --- diff -up fakenes-0.5.9-beta3/default.cbd~ fakenes-0.5.9-beta3/default.cbd --- fakenes-0.5.9-beta3/default.cbd~ 2007-06-25 18:43:10.000000000 +0200 +++ fakenes-0.5.9-beta3/default.cbd 2011-12-10 20:37:13.528058876 +0100 @@ -297,7 +297,7 @@ ifopt clean goto clean CXXFLAGS = "${CFLAGS}" # We have to include this or we get undefined references to new & delete. -LDFLAGS += ' -lstdc++' +LDFLAGS += ' -lstdc++ -lm' compile ${SRCFILES} Index: fakenes.spec =================================================================== RCS file: /cvs/free/rpms/fakenes/F-16/fakenes.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fakenes.spec 3 Oct 2011 19:24:59 -0000 1.8 +++ fakenes.spec 10 Dec 2011 19:54:46 -0000 1.9 @@ -2,7 +2,7 @@ Name: fakenes Version: 0.5.9 -Release: 0.2.%{beta}%{?dist} +Release: 0.3.%{beta}%{?dist} Summary: Nintendo Entertainment System emulator Group: Amusements/Games License: Artistic @@ -13,9 +13,11 @@ Patch1: fakenes-0.5.8-driver-switch.patch Patch2: fakenes-0.5.9-beta3-gcc43.patch Patch3: fakenes-0.5.9-beta3-openal-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch4: fakenes-0.5.9-beta3-allegro44-build.patch +Patch5: fakenes-0.5.9-beta3-libm-build.patch BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel BuildRequires: libGLU-devel freealut-devel desktop-file-utils +BuildRequires: libicns-utils Requires: hicolor-icon-theme %description @@ -32,6 +34,8 @@ %patch1 -p1 -z .driver %patch2 -p1 -z .gcc43 %patch3 -p1 -z .openal-build +%patch4 -p1 -z .allegro44-build +%patch5 -p1 -z .libm sed -i 's/\r//' docs/faq.html @@ -39,43 +43,47 @@ export CFLAGS="$RPM_OPT_FLAGS -ffast-math" make cbuild ./cbuild --verbose +icns2png -x build/mac/FakeNES.icns +touch -r build/mac/FakeNES.icns FakeNES_128x128x32.png %install -rm -rf $RPM_BUILD_ROOT install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor dribble \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 644 support/icon-32x32.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png - - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps +install -p -m 644 FakeNES_128x128x32.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%defattr(-, root, root) %doc docs/CHANGES docs/LICENSE docs/README docs/faq.html %{_bindir}/%{name} %{_datadir}/applications/dribble-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %changelog +* Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 0.5.9-0.3.beta3 +- Fix building with allegro-4.4.x (rf#1969) +- Fix the broken icon + * Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.5.9-0.2.beta3 - Rebuilt for liballeg