Hello community, here is the log from the commit of package wesnoth for openSUSE:Factory checked in at 2017-09-11 16:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wesnoth (Old) and /work/SRC/openSUSE:Factory/.wesnoth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wesnoth" Mon Sep 11 16:17:57 2017 rev:3 rq:522265 version:1.12.6 Changes: -------- --- /work/SRC/openSUSE:Factory/wesnoth/wesnoth.changes 2017-02-04 16:51:46.195742430 +0100 +++ /work/SRC/openSUSE:Factory/.wesnoth.new/wesnoth.changes 2017-09-11 16:18:10.663574584 +0200 @@ -1,0 +2,8 @@ +Tue Aug 8 13:31:56 UTC 2017 - r...@fthiessen.de + +- Add patch link-boost.patch that adds missing boost-system linkage. +- Use cmake macro +- Removed duplicated filesystem structure from fs subpackage. +- spec file cleanup. + +------------------------------------------------------------------- New: ---- link-boost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wesnoth.spec ++++++ --- /var/tmp/diff_new_pack.NYnkzG/_old 2017-09-11 16:18:19.194376557 +0200 +++ /var/tmp/diff_new_pack.NYnkzG/_new 2017-09-11 16:18:19.198375995 +0200 @@ -17,30 +17,21 @@ %define major_version 1.12 - Name: wesnoth Version: 1.12.6 Release: 0 Summary: Fantasy Turn-Based Strategy Game -License: GPL-2.0+ +License: GPL-2.0+ and EPL-1.0 Group: Amusements/Games/Strategy/Turn Based Url: http://www.wesnoth.org Source: http://downloads.sf.net/project/wesnoth/wesnoth-%{major_version}/wesnoth-%{version}/wesnoth-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM link-boost.patch -- https://github.com/wesnoth/wesnoth/pull/1889 +Patch0: link-boost.patch BuildRequires: SDL-devel >= 1.2.7 -BuildConflicts: SDL-devel = 1.2.14 BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel BuildRequires: SDL_ttf-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_iostreams-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_program_options-devel -BuildRequires: libboost_regex-devel -%else -BuildRequires: boost-devel >= 1.48.0 -%endif BuildRequires: cmake >= 2.6.0 BuildRequires: dejavu BuildRequires: fdupes @@ -51,6 +42,7 @@ BuildRequires: libvorbis-devel BuildRequires: lua-devel BuildRequires: optipng +BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: sazanami-fonts BuildRequires: update-desktop-files @@ -60,7 +52,16 @@ BuildRequires: pkgconfig(pango) Requires: wesnoth-data = %{version} Requires: wesnoth-fslayout = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildConflicts: SDL-devel = 1.2.14 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_program_options-devel +BuildRequires: libboost_regex-devel +%else +BuildRequires: boost-devel >= 1.48.0 +%endif %description Battle for Wesnoth is a fantasy turn-based strategy game. Battle for @@ -116,18 +117,12 @@ %description fslayout This package solely contains the basic file structure in order to have it owned by a package. - %prep %setup -q +%patch0 -p1 %build -export CFLAGS="%{optflags} -Wno-unused" -export CXXFLAGS="%{optflags} -Wno-unused" -export LDFLAGS="-Wl,-Bsymbolic-functions -Wl,--copy-dt-needed-entries $LDFLAGS" - -cmake -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMANDIR=%{_mandir} \ +%cmake -DMANDIR=%{_mandir} \ -DDOCDIR=%{_docdir}/wesnoth \ -DENABLE_GAME=ON \ -DENABLE_CAMPAIGN_SERVER=ON \ @@ -140,37 +135,40 @@ -DSERVER_UID=root \ -DSERVER_GID=root -# see http://www.wesnoth.org/forum/viewtopic.php?f=5&t=26167 for --disable-strict-compilation make %{?_smp_mflags} VERBOSE=1 %install -%make_install +%cmake_install ln -snf %{_datadir}/fonts/truetype/sazanami-gothic.ttf %{buildroot}/%{_datadir}/%{name}/fonts ln -snf %{_datadir}/fonts/truetype/DejaVuSans.ttf %{buildroot}/%{_datadir}/%{name}/fonts %suse_update_desktop_file -i %{name} Game StrategyGame %suse_update_desktop_file -i %{name}_editor Game StrategyGame +# find_lang only finds one type of filename, this one all .mo files. +for dir in %{buildroot}/%{_datadir}/wesnoth/translations/*; do + for file in "$dir/LC_MESSAGES/"*.mo; do + echo "%%lang($(basename "$dir")) /$(realpath --relative-to %{buildroot} "$file")" >> %{name}.lang + done +done + %fdupes -s %{buildroot} %files -%defattr(-,root,root) %{_bindir}/%{name} %{_datadir}/pixmaps/%{name}-icon.png %{_datadir}/applications/%{name}.desktop -%{_mandir}/man*/wesnoth.* -%{_mandir}/*/man*/wesnoth.* +%{_mandir}/man*/wesnoth.*%{ext_man} +%{_mandir}/*/man*/wesnoth.*%{ext_man} %{_datadir}/pixmaps/%{name}_editor-icon.png %{_datadir}/applications/%{name}_editor.desktop -%files data -%defattr(-,root,root) +%files data -f %{name}.lang %doc COPYING changelog copyright %{_datadir}/wesnoth/ %{_docdir}/wesnoth/ %files tools -%defattr(-,root,root) %{_bindir}/cutter %{_bindir}/exploder %{_bindir}/schema_validator @@ -178,25 +176,16 @@ %{_bindir}/wesmage %files server -%defattr(-,root,root) %{_bindir}/%{name}d -%{_mandir}/man*/%{name}d.* -%{_mandir}/*/man*/%{name}d.* +%{_mandir}/man*/%{name}d.*%{ext_man} +%{_mandir}/*/man*/%{name}d.*%{ext_man} %files campaign-server -%defattr(-,root,root) %{_bindir}/campaignd %files fslayout -%defattr(-,root,root) -%dir %{_mandir}/cs -%dir %{_mandir}/cs/man6 -%dir %{_mandir}/da -%dir %{_mandir}/da/man6 -%dir %{_mandir}/de/man6 %dir %{_mandir}/en_GB %dir %{_mandir}/en_GB/man6 -%dir %{_mandir}/es/man6 %dir %{_mandir}/et %dir %{_mandir}/et/man6 %dir %{_mandir}/fi @@ -209,21 +198,10 @@ %dir %{_mandir}/id %dir %{_mandir}/id/man6 %dir %{_mandir}/it/man6 -%dir %{_mandir}/ja/man6 %dir %{_mandir}/lt %dir %{_mandir}/lt/man6 -%dir %{_mandir}/nl -%dir %{_mandir}/nl/man6 -%dir %{_mandir}/pl -%dir %{_mandir}/pl/man6 -%dir %{_mandir}/pt_BR -%dir %{_mandir}/pt_BR/man6 %dir %{_mandir}/racv %dir %{_mandir}/racv/man6 -%dir %{_mandir}/ru -%dir %{_mandir}/ru/man6 -%dir %{_mandir}/sk -%dir %{_mandir}/sk/man6 %dir %{_mandir}/sr %dir %{_mandir}/sr/man6 %dir %{_mandir}/sr@latin @@ -232,17 +210,11 @@ %dir %{_mandir}/sr@ijekavian/man6 %dir %{_mandir}/sr@ijekavianlatin %dir %{_mandir}/sr@ijekavianlatin/man6 -%dir %{_mandir}/sv -%dir %{_mandir}/sv/man6 %dir %{_mandir}/tr %dir %{_mandir}/tr/man6 %dir %{_mandir}/uk %dir %{_mandir}/uk/man6 %dir %{_mandir}/vi %dir %{_mandir}/vi/man6 -%dir %{_mandir}/zh_CN -%dir %{_mandir}/zh_CN/man6 -%dir %{_mandir}/zh_TW -%dir %{_mandir}/zh_TW/man6 %changelog ++++++ link-boost.patch ++++++ diff -Nur wesnoth-1.12.6/CMakeLists.txt new/CMakeLists.txt --- wesnoth-1.12.6/CMakeLists.txt 2016-05-18 02:57:46.000000000 +0200 +++ new/CMakeLists.txt 2017-08-08 13:53:48.459804931 +0200 @@ -598,7 +598,7 @@ endif(ENABLE_NOTIFICATIONS) if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) - find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) + find_package( Boost 1.44 REQUIRED COMPONENTS filesystem system) find_package( Boost 1.48 REQUIRED COMPONENTS locale ) endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) @@ -606,7 +606,7 @@ if(ENABLE_SERVER) if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) - find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) + find_package( Boost 1.44 REQUIRED COMPONENTS filesystem system) find_package( Boost 1.48 REQUIRED COMPONENTS locale ) endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) endif(ENABLE_SERVER) diff -Nur wesnoth-1.12.6/src/CMakeLists.txt new/src/CMakeLists.txt --- wesnoth-1.12.6/src/CMakeLists.txt 2016-05-18 02:57:46.000000000 +0200 +++ new/src/CMakeLists.txt 2017-08-08 14:07:51.045640325 +0200 @@ -87,6 +87,7 @@ set(common-external-libs ${common-external-libs} ${Boost_FILESYSTEM_LIBRARY} + ${Boost_SYSTEM_LIBRARY} ${Boost_LOCALE_LIBRARY} ) else(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
