[gbrainy/f14] Update to 2.00
Marcelin Benoît
sereinit at fedoraproject.org
Tue Jul 26 21:13:39 UTC 2011
commit ed413f0e6abfe321851b28cd15ac0a15ea67c595
Author: Benoît Marcelin <sereinity at online.fr>
Date: Tue Jul 26 19:10:25 2011 +0200
Update to 2.00
.gitignore | 3 ++
gbrainy.spec | 90 +++++++++++++++++++++++++++++++++++++++++++++++++---------
sources | 4 ++-
3 files changed, 82 insertions(+), 15 deletions(-)
---
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.spec b/gbrainy.spec
index c7b2265..cfbedbd 100644
--- a/gbrainy.spec
+++ b/gbrainy.spec
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# %define debug_package %{nil}
# Because it's a Mono package and generate an empty debuginfo
# http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257
@@ -16,9 +17,32 @@ 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
BuildRequires: /usr/bin/desktop-file-install
+=======
+# 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: gtk-sharp2-devel mono-addins-devel gnome-sharp-devel
+BuildRequires: librsvg2-devel gnome-doc-utils
+BuildRequires: intltool
+>>>>>>> 26bd518... Update to gbrainy 2.00
-# 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,16 +51,23 @@ 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.
%prep
%setup -q
+<<<<<<< HEAD
# To fix 460353 :
sed 's#share/games#share#' src/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"
+>>>>>>> 26bd518... Update to gbrainy 2.00
%build
%configure
@@ -45,11 +76,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
@@ -61,14 +92,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
@@ -78,11 +113,38 @@ fi
%{_libdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/%{name}
+<<<<<<< HEAD
+=======
+%{_datadir}/gnome/help/%{name}
+>>>>>>> 26bd518... Update to gbrainy 2.00
%{_datadir}/icons/hicolor/*/apps/%{name}*
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/pixmaps/%{name}*
%changelog
+<<<<<<< HEAD
+=======
+* Mon Jul 25 2011 Benoît Marcelin <sereinity at online.fr> 2.00-1
+- Update to 2.00
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.52-4.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-3.1
+- Add BR libtool
+
+* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-3
+- Change gnome-common to gnome-doc-utils
+
+* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-2
+- Add BR gnome-common
+
+* Wed Oct 27 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-1
+- Bump to 1.52
+- Add devel subpackage
+- Rebuild against mono-2.8
+
+>>>>>>> 26bd518... Update to gbrainy 2.00
* Mon Jun 07 2010 Christian Krause <chkr at fedoraproject.org> - 1.1-7
- Rebuilt against new mono-addins
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
More information about the scm-commits
mailing list