corsepiu pushed to springlobby (f22). "Update to 0.195 (Merger from f20). (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 12:23:11 UTC 2015
>From f8542841dd88e262c2de7e82f238df87e62443d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 8 Apr 2015 14:07:27 +0200
Subject: Update to 0.195 (Merger from f20).
- Fix FTBFS.
- spec-file cleanup.
- Drop springlobby-dso.patch, springlobby-gtkfix.patch.
diff --git a/.gitignore b/.gitignore
index 182b616..09e9649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-springlobby-0.95.tar.bz2
-/springlobby-0.101.tar.bz2
-/springlobby-0.116.tar.bz2
-/springlobby-0.118.tar.bz2
-/springlobby-0.120.tar.bz2
-/springlobby-0.124.tar.bz2
-/springlobby-0.128.tar.bz2
-/springlobby-0.131.tar.bz2
-/springlobby-0.136.tar.bz2
-/springlobby-0.139.tar.bz2
-/springlobby-0.144.tar.bz2
-/springlobby-0.147.tar.bz2
-/springlobby-0.169.tar.bz2
+/springlobby-0.195.tar.bz2
diff --git a/sources b/sources
index 265e0c6..c2a3dc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1eb265268ac39d9b7e8fec90df92ff3d springlobby-0.169.tar.bz2
+9a13e2207c80382561f02c74f571b339 springlobby-0.195.tar.bz2
diff --git a/springlobby-dso.patch b/springlobby-dso.patch
deleted file mode 100644
index 13910d6..0000000
--- a/springlobby-dso.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt.dso 2010-04-21 19:33:17.000000000 +0200
-+++ CMakeLists.txt 2010-05-04 20:17:34.702775603 +0200
-@@ -165,6 +165,14 @@
- ELSE()
- MESSAGE( FATAL_ERROR "libtorrent-rasterbar library not found! Please install the package or toggle OPTION_TORRENT_SYSTEM to OFF")
- ENDIF()
-+ FIND_PACKAGE( Boost COMPONENTS system )
-+ IF( Boost_FOUND )
-+ link_directories( ${Boost_LIB_DIR} )
-+ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
-+ LINK_LIBRARIES( boost_system-mt )
-+ ELSE()
-+ MESSAGE( FATAL_ERROR "boost library not found! Please install the package or toggle OPTION_TORRENT_SYSTEM to OFF")
-+ ENDIF()
- ELSE( NOT WIN32)
- link_directories( ${boost_LIB_DIR} )
- INCLUDE_DIRECTORIES( ${boost_INCLUDE_DIR} )
diff --git a/springlobby-gtkfix.patch b/springlobby-gtkfix.patch
deleted file mode 100644
index c108d96..0000000
--- a/springlobby-gtkfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.old 2011-08-22 14:19:43.212768297 +0300
-+++ CMakeLists.txt 2011-08-22 14:20:09.123480182 +0300
-@@ -204,6 +204,8 @@
- IF( LIBNOTIFY_FOUND )
- INCLUDE_DIRECTORIES( ${LIBNOTIFY_INCLUDE_DIRS} )
- LINK_LIBRARIES( ${LIBNOTIFY_LIBRARIES} )
-+ FIND_PACKAGE(GTK2 COMPONENTS gtk)
-+ INCLUDE_DIRECTORIES (${GTK2_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES( ${GLIB_INCLUDE_DIRS} )
- LINK_LIBRARIES( ${GLIB_LIBRARIES} )
- ADD_DEFINITIONS( -DHAVE_LIBNOTIFY )
diff --git a/springlobby.spec b/springlobby.spec
index 33282e5..45702bf 100644
--- a/springlobby.spec
+++ b/springlobby.spec
@@ -1,9 +1,8 @@
Name: springlobby
-Version: 0.169
-Release: 12%{?dist}
+Version: 0.195
+Release: 2%{?dist}
Summary: A lobby client for the spring RTS game engine
-Group: Amusements/Games
# License clarification: http://springlobby.info/issues/show/810
License: GPLv2
URL: http://springlobby.info
@@ -15,8 +14,8 @@ BuildRequires: SDL-devel, SDL_sound-devel, SDL_mixer-devel
BuildRequires: pkgconfig, desktop-file-utils, gettext
BuildRequires: openal-devel, libcurl-devel
BuildRequires: alure-devel
-BuildRequires: fluidsynth-devel
BuildRequires: dumb-devel
+BuildRequires: boost-devel
# There are other "lobbies" for spring, make a virtual-provides
Provides: spring-lobby = %{version}-%{release}
@@ -30,30 +29,14 @@ SpringLobby is a free cross-platform lobby client for the Spring RTS project.
%prep
%setup -q
-#%patch0 -p0 -b .springlobby-gtkfix
%build
-# Use boost filesystem 2 explicitly (bug 654807)
-%if 0%{?fedora} >= 18
-export CFLAGS="$CFLAGS -DBOOST_FILESYSTEM_VERSION=3"
-export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=3"
-%else
-export CFLAGS="$CFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-%endif
%cmake
make %{?_smp_mflags}
%install
%make_install
-# Manually copy the missing libraries.
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-cp ./src/downloader/lib/src/libCurlWrapper.so $RPM_BUILD_ROOT/%{_libdir}
-cp ./src/downloader/lib/src/FileSystem/libFileSystem.so $RPM_BUILD_ROOT/%{_libdir}
-
-# Handled in %%doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/
# Useless file
rm -f $RPM_BUILD_ROOT%{_prefix}/config.h
@@ -115,15 +98,19 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%doc AUTHORS NEWS README COPYING THANKS
+%{_pkgdocdir}
%{_bindir}/*
-%{_libdir}/libCurlWrapper.so
-%{_libdir}/libFileSystem.so
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%changelog
+* Wed Apr 08 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.195-2
+- Update to 0.195 (Merger from f20).
+- Fix FTBFS.
+- spec-file cleanup.
+- Drop springlobby-dso.patch, springlobby-gtkfix.patch.
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 0.169-12
- Add an AppData file for the software center
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/springlobby.git/commit/?h=f22&id=f8542841dd88e262c2de7e82f238df87e62443d6
More information about the scm-commits
mailing list