From 65c5dbab56d60a0899a55c8fa87e123fa2d756b6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Oct 11 2013 00:01:48 +0000 Subject: Update to 0.4.7 w/ bundled jthread Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 95ad44b..e796f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /minetest_game-0.4.3.tar.gz /minetest-0.4.4.tar.gz /minetest_game-0.4.4.tar.gz +/minetest-0.4.7.tar.gz +/minetest_game-0.4.7.tar.gz diff --git a/0001-build-jthread-static.patch b/0001-build-jthread-static.patch new file mode 100644 index 0000000..7f1e330 --- /dev/null +++ b/0001-build-jthread-static.patch @@ -0,0 +1,26 @@ +From cc06e4d3f704a472e898cf179ebcc269463416db Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Fri, 11 Oct 2013 03:09:27 +0400 +Subject: [PATCH 1/2] build jthread static + +Signed-off-by: Igor Gnatenko +--- + src/jthread/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jthread/CMakeLists.txt b/src/jthread/CMakeLists.txt +index be38f87..91cc5e5 100644 +--- a/src/jthread/CMakeLists.txt ++++ b/src/jthread/CMakeLists.txt +@@ -6,7 +6,7 @@ else( UNIX ) + set(jthread_platform_LIBS "") + endif( UNIX ) + +-add_library(jthread ${jthread_SRCS}) ++add_library(jthread STATIC ${jthread_SRCS}) + + target_link_libraries( + jthread +-- +1.8.3.1 + diff --git a/0002-make-working-FindJson.cmake.patch b/0002-make-working-FindJson.cmake.patch new file mode 100644 index 0000000..2f535da --- /dev/null +++ b/0002-make-working-FindJson.cmake.patch @@ -0,0 +1,49 @@ +From e80cf3151638df348c12775f0297da617b9411a5 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Fri, 11 Oct 2013 03:29:03 +0400 +Subject: [PATCH 2/2] make working FindJson.cmake + +Signed-off-by: Igor Gnatenko +--- + cmake/Modules/FindJson.cmake | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake +index a9178a2..399b2eb 100644 +--- a/cmake/Modules/FindJson.cmake ++++ b/cmake/Modules/FindJson.cmake +@@ -1,18 +1,21 @@ + # Look for json, use our own if not found + +-#FIND_PATH(JSON_INCLUDE_DIR json.h) ++FIND_PATH(JSON_INCLUDE_DIR json/features.h ++ PATH_SUFFIXES jsoncpp) + +-#FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp) ++FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp) ++MESSAGE(STATUS "dir: ${JSON_INCLUDE_DIR}") ++MESSAGE(STATUS "lib: ${JSON_LIBRARY}") + +-#IF(JSON_LIBRARY AND JSON_INCLUDE_DIR) +-# SET( JSON_FOUND TRUE ) +-#ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR) ++IF(JSON_LIBRARY AND JSON_INCLUDE_DIR) ++ SET(JSON_FOUND TRUE) ++ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR) + +-#IF(JSON_FOUND) +-# MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}") +-# MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}") +-#ELSE(JSON_FOUND) ++IF(JSON_FOUND) ++ MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}") ++ MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}") ++ELSE(JSON_FOUND) + SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json) + SET(JSON_LIBRARY jsoncpp) + MESSAGE(STATUS "Using project jsoncpp library") +-#ENDIF(JSON_FOUND) ++ENDIF(JSON_FOUND) +-- +1.8.3.1 + diff --git a/minetest.spec b/minetest.spec index 351ca8a..41f12a9 100644 --- a/minetest.spec +++ b/minetest.spec @@ -1,13 +1,12 @@ - Name: minetest -Version: 0.4.4 +Version: 0.4.7 Release: 1%{?dist} Summary: Multiplayer infinite-world block sandbox with survival mode -License: LGPLv2+ and CC-BY-SA +# bundled(jthread) uses MIT license +License: LGPLv2+ and CC-BY-SA and MIT URL: http://minetest.net/ -# curl -L -O http://github.com/celeron55/minetest/tarball/0.4.3/minetest-0.4.3.tar.gz # wget https://raw.github.com/RussianFedora/minetest/fedora/minetest.desktop # wget https://raw.github.com/RussianFedora/minetest/fedora/minetest.service # wget https://raw.github.com/RussianFedora/minetest/fedora/minetest.rsyslog @@ -23,17 +22,22 @@ Source5: %{name}.README Source6: https://github.com/minetest/minetest_game/archive/%{version}/%{name}_game-%{version}.tar.gz Source7: http://www.gnu.org/licenses/lgpl-2.1.txt -# Fix to build with gcc-4.7.0 -Patch1: %{name}-0.4.3-gcc.patch +Patch0: 0001-build-jthread-static.patch +# https://github.com/minetest/minetest/pull/954 +Patch1: 0002-make-working-FindJson.cmake.patch + +# https://fedorahosted.org/fpc/ticket/347 +Provides: bundled(jthread) BuildRequires: cmake >= 2.6.0 BuildRequires: irrlicht-devel -BuildRequires: bzip2-devel gettext-devel jthread-devel sqlite-devel +BuildRequires: bzip2-devel gettext-devel sqlite-devel BuildRequires: libpng-devel libjpeg-turbo-devel libXxf86vm mesa-libGL-devel BuildRequires: desktop-file-utils BuildRequires: systemd BuildRequires: openal-soft-devel BuildRequires: libvorbis-devel +BuildRequires: jsoncpp-devel Requires: %{name}-server = %{version}-%{release} Requires: hicolor-icon-theme @@ -56,6 +60,7 @@ Minetest multiplayer server. This package does not require X Window System %prep %setup -q +%patch0 -p1 %patch1 -p1 pushd games @@ -64,10 +69,12 @@ mv %{name}_game-%{version} %{name}_game popd cp %{SOURCE7} doc/ -rm -rf %{buildroot}/%{name}-%{version}/src/jthread + +# purge bundled jsoncpp +rm -rf src/json %build -%cmake -DJTHREAD_INCLUDE_DIR=%{_includedir}/jthread . +%cmake . make %{?_smp_mflags} %install @@ -134,7 +141,7 @@ exit 0 # %%files -f %%{name}.lang %files -%doc doc/lgpl-2.1.txt README.fedora +%doc doc/lgpl-2.1.txt src/jthread/LICENSE.MIT README.fedora %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -142,7 +149,7 @@ exit 0 %{_mandir}/man6/minetest.* %files server -%doc README.txt doc/lgpl-2.1.txt doc/mapformat.txt doc/protocol.txt README.fedora +%doc README.txt doc/lgpl-2.1.txt src/jthread/LICENSE.MIT doc/mapformat.txt doc/protocol.txt README.fedora %{_bindir}/%{name}server %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/%{name}.conf @@ -151,8 +158,11 @@ exit 0 %attr(0755,minetest,minetest) %dir %{_sharedstatedir}/%{name} %{_mandir}/man6/minetestserver.* - %changelog +* Fri Oct 11 2013 Igor Gnatenko - 0.4.7-1 +- Update to 0.4.7 w/ bundled jthread +- Bundle jthread correctly (kalev) + * Thu Sep 5 2013 Igor Gnatenko - 0.4.4-1 - Update to 0.4.4 - Fix systemd scripts (rhbz 850208) diff --git a/sources b/sources index 3a29d6a..5324680 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -82efa16859aee366570ca7cca7c8d7dd minetest-0.4.4.tar.gz -f9fb598738b63da218f41c61b974be4e minetest_game-0.4.4.tar.gz +a5b9f9a0829e7037c2d173a6655ba699 minetest_game-0.4.7.tar.gz