[springlobby/f14/master] - Boost fix. - Libnotify fix. - Upgrade to 0.124.
Gilboa Davara
gilboa at fedoraproject.org
Thu Mar 10 05:21:53 UTC 2011
commit faf16e0fa83d587b3bb57df533b69f865b83bc30
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Thu Mar 10 07:21:25 2011 +0200
- Boost fix.
- Libnotify fix.
- Upgrade to 0.124.
.gitignore | 3 ++
sources | 3 +-
springlobby.spec | 103 +++++++++++++++++++++++++++++++-----------------------
3 files changed, 63 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ad237b..7da54ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ springlobby-0.95.tar.bz2
/springlobby-gtkfix.patch
/springlobby-0.118.tar.bz2
/springlobby-0.120.tar.bz2
+/libnotify-070-fix.patch
+/springlobby-dso.patch
+/springlobby-0.124.tar.bz2
diff --git a/sources b/sources
index f01bb39..904fb5c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-79f230cb665f7aac635ffe71abef14ef springlobby-0.120.tar.bz2
-8a81cf4b06ad7404170e8ccfab454ab0 springlobby-gtkfix.patch
+f877a02e9559690f6f90e2eae163fdcc springlobby-0.124.tar.bz2
diff --git a/springlobby.spec b/springlobby.spec
index 067cfb4..17620ca 100644
--- a/springlobby.spec
+++ b/springlobby.spec
@@ -1,31 +1,32 @@
-Name: springlobby
-Version: 0.120
-Release: 1%{?dist}
-Summary: A lobby client for the spring RTS game engine
+Name: springlobby
+Version: 0.124
+Release: 1%{?dist}
+Summary: A lobby client for the spring RTS game engine
-Group: Amusements/Games
+Group: Amusements/Games
# License clarification: http://springlobby.info/issues/show/810
-License: GPLv2
-URL: http://springlobby.info
-Source0: http://www.springlobby.info/tarballs/springlobby-%{version}.tar.bz2
+License: GPLv2
+URL: http://springlobby.info
+Source0: http://www.springlobby.info/tarballs/springlobby-%{version}.tar.bz2
Patch0: springlobby-gtkfix.patch
+Patch1: libnotify-070-fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake
-BuildRequires: wxGTK-devel, rb_libtorrent-devel
-BuildRequires: SDL-devel, SDL_sound-devel, SDL_mixer-devel
-BuildRequires: pkgconfig, desktop-file-utils, gettext
-BuildRequires: openal-devel, libcurl-devel
+BuildRequires: cmake
+BuildRequires: wxGTK-devel, rb_libtorrent-devel
+BuildRequires: SDL-devel, SDL_sound-devel, SDL_mixer-devel
+BuildRequires: pkgconfig, desktop-file-utils, gettext
+BuildRequires: openal-devel, libcurl-devel
# There are other "lobbies" for spring, make a virtual-provides
-Provides: spring-lobby = %{version}-%{release}
+Provides: spring-lobby = %{version}-%{release}
-Requires: hicolor-icon-theme
+Requires: hicolor-icon-theme
# Springlobby is completely useless without the spring package
-Requires: spring
+Requires: spring
# Spring does not build on PPC, exclude it here too
-ExcludeArch: ppc ppc64
+ExcludeArch: ppc ppc64
%description
@@ -35,9 +36,13 @@ SpringLobby is a free cross-platform lobby client for the Spring RTS project.
%prep
%setup -q
%patch0 -p1 -b .springlobby-gtkfix
+%patch1 -p1 -b .libnotify-070-fix
%build
+# Use boost filesystem 2 explicitly (bug 654807)
+export CFLAGS="$CFLAGS -DBOOST_FILESYSTEM_VERSION=2"
+export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
%cmake
make %{?_smp_mflags}
@@ -53,12 +58,12 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/config.h
# Fix Icon entry
sed -i -e 's/^Icon=\(.*\).svg/Icon=\1/g' \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Application \
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
@@ -68,8 +73,8 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
@@ -89,70 +94,80 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Jan 11 2011 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.120-1
+* Thu Mar 10 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 0.124-1
+- Version 0.124 (Large number of fixes).
+
+* Fri Feb 14 2011 Leigh Scott <leigh123linux at googlemail.com> - 0.120-3
+- specify boost_filesystem version
+- patch for libnotify changes
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.120-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 11 2011 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.120-1
- BT download broken by new spring release.
-* Tue Dec 17 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.118-1
+* Tue Dec 17 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.118-1
- version 0.118 (w/ GTK fix)
- BT download should work now.
-* Tue Nov 18 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.116-1
+* Tue Nov 18 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.116-1
- version 0.116 (w/ GTK fix)
* Wed Sep 29 2010 jkeating - 0.101-2
- Rebuilt for gcc bug 634757
-* Wed Sep 15 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.101-1
+* Wed Sep 15 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.101-1
- version 0.101
-* Mon Aug 16 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.80-2
+* Mon Aug 16 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.80-2
- version 0.95
* Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 0.80-2
- rebuilt against wxGTK-2.8.11-2
-* Mon May 10 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.80-1
+* Mon May 10 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.80-1
- version 0.80
-* Tue May 04 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.79-1
+* Tue May 04 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.79-1
- version 0.79
- add patch to fix DSO linking
- (http://fedoraproject.org/wiki/UnderstandingDSOLinkChange)
+ (http://fedoraproject.org/wiki/UnderstandingDSOLinkChange)
-* Sun May 02 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.78-1
+* Sun May 02 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.78-1
- version 0.78
-* Sun Mar 21 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.63-1
+* Sun Mar 21 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.63-1
- version 0.63
-* Sun Jan 31 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.61-2
+* Sun Jan 31 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.61-2
- missing BR: openal-devel
-* Sun Jan 31 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.61-1
+* Sun Jan 31 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.61-1
- version 0.61
-* Sat Jan 23 2010 Caolán McNamara <caolanm at redhat.com> - 0.40-2
+* Sat Jan 23 2010 Caolán McNamara <caolanm at redhat.com> - 0.40-2
- rebuild for boost
-* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.40-1
+* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.40-1
- version 0.40
* Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.35-1
- version 0.35
-* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.27-1
+* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.27-1
- version 0.27
-* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.23-1
+* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.23-1
- version 0.23
-* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.22-1
+* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.22-1
- version 0.22
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.19-2
- rebuilt with new openssl
-* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.19-1
+* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.19-1
- version 0.19
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
More information about the scm-commits
mailing list