From 194012fda9f1d6038c23fe690dccec7b918cdceb Mon Sep 17 00:00:00 2001 From: Benoît Marcelin Date: Jul 26 2011 17:16:07 +0000 Subject: Update to gbrainy 2.00 --- diff --git a/.gitignore b/.gitignore index 2b9f74b..6cf990b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ gbrainy-1.1.tar.gz +/gbrainy-2.00.tar.gz +/GtkMenu_ubuntu_local.patch +/fix-location.patch diff --git a/gbrainy-1.52.tar.gz b/gbrainy-1.52.tar.gz deleted file mode 100644 index a750d33..0000000 Binary files a/gbrainy-1.52.tar.gz and /dev/null differ diff --git a/gbrainy.spec b/gbrainy.spec index bb54d86..9975d05 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,24 +1,27 @@ -# %define debug_package %{nil} -# Because it's a Mono package and generate an empty debuginfo -# http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257 - -Name: gbrainy -Version: 1.52 -Release: 4.1%{?dist} -Summary: A brain teaser game and trainer to keep your brain trained - -Group: Amusements/Games -License: GPLv2 -URL: http://live.gnome.org/gbrainy -Source0: http://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://fedoraproject.org/wiki/Packaging/Debuginfo#Useless_or_incomplete_debuginfo_packages_due_to_other_reasons +%global debug_package %{nil} + +Name: gbrainy +Version: 2.00 +Release: 1%{?dist} +Summary: A brain teaser game and trainer to keep your brain trained + +Group: Amusements/Games +License: GPLv2 +URL: http://live.gnome.org/gbrainy +Source0: http://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz +# To fix 460353 : +Patch0: fix-location.patch +# Fix warning when starting +Patch1: GtkMenu_ubuntu_local.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: mono-devel intltool librsvg2-devel mono-addins-devel -BuildRequires: gtk-sharp2-devel gnome-sharp-devel gnome-doc-utils -BuildRequires: /usr/bin/desktop-file-install libtool +BuildRequires: gtk-sharp2-devel mono-addins-devel gnome-sharp-devel +BuildRequires: librsvg2-devel gnome-doc-utils +BuildRequires: intltool -# Mono not availible on these: -ExcludeArch: sparc64 +# JIT (mono) only availible on these: +ExclusiveArch: %ix86 x86_64 ia64 %{arm} sparcv9 alpha s390x ppc ppc64 %description gbrainy is a brain teaser game and trainer to have @@ -27,9 +30,9 @@ fun and to keep your brain trained. It provides the following types of games: * Logic puzzles. Games designed to challenge your - reasoning and thinking skills. + reasoning and thinking skills. * Mental calculation. Games based on arithmetical - operations designed to prove your mental calculation skills. + operations designed to prove your mental calculation skills. * Memory trainers. Games designed to challenge your short term memory. %package devel @@ -43,11 +46,10 @@ for writing gbrainy applications. %prep %setup -q -./autogen.sh -# To fix 460353 : -sed 's#share/games#share#' src/Core/Main/Defines.cs.in -i -sed 's#^images = $(datadir)/games/gbrainy$#images = $(datadir)/gbrainy#' data/Makefile.in -i +%patch0 -p1 +%patch1 -p1 sed -i -e 's!{exec_prefix}/lib!%{_libdir}!' data/gbrainy.pc.in +echo "sed done $PWD" %build @@ -57,11 +59,11 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --delete-original \ - --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +desktop-file-install \ + --delete-original \ + --vendor fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # To fix a rpmlint issue chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.exe.config @@ -73,14 +75,18 @@ rm -rf "$RPM_BUILD_ROOT" %post touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -fi %postun -touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +if [ $1 -eq 0 ] ;then + touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: + if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + fi +fi + +%posttrans if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %files -f %{name}.lang @@ -90,7 +96,6 @@ fi %{_libdir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name} -%{_datadir}/games/%{name} %{_datadir}/gnome/help/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}* %{_mandir}/man6/%{name}.6.gz @@ -101,6 +106,9 @@ fi %{_libdir}/pkgconfig/gbrainy.pc %changelog +* Mon Jul 25 2011 Benoît Marcelin 2.00-1 +- Update to 2.00 + * Wed Feb 09 2011 Fedora Release Engineering - 1.52-4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 85af410..9f99750 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -2c2ec926ad461c6f1a6da391615824ca gbrainy-1.1.tar.gz +7a4aa5da38319f5da15b934b26807ecb fix-location.patch +d7d29348868ee764408fd1a42d01d961 gbrainy-2.00.tar.gz +c048e1a2f1312f3a35ae19061fa0c066 GtkMenu_ubuntu_local.patch