From fb4e0ded6af1170d1817c9c8ab898af0b3d22421 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Feb 09 2018 07:45:58 +0000 Subject: Update to version 8.0 Disable Werror=format-security flag (https://github.com/openclonk/openclonk/issues/64) Use appdata file from upstream --- diff --git a/.gitignore b/.gitignore index 61351a9..6bebece 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /openclonk-7.0.tar.gz +/openclonk-8.0.tar.gz diff --git a/openclonk.spec b/openclonk.spec index 1ad1560..deadb3b 100644 --- a/openclonk.spec +++ b/openclonk.spec @@ -2,10 +2,10 @@ Name: openclonk Summary: Multiplayer action, tactics and skill game -Version: 7.0 -Release: 11%{?dist} +Version: 8.0 +Release: 1%{?dist} URL: http://www.openclonk.org/ -Source0: https://github.com/openclonk/openclonk/archive/v7.0.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/openclonk/openclonk/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz License: ISC and CC-BY-SA Group: Amusements/Games @@ -14,21 +14,23 @@ Source2: %{name}-html-en.desktop Source3: %{name}-docs.png BuildRequires: boost-devel -BuildRequires: cmake +BuildRequires: cmake, gcc-c++ BuildRequires: gtest-devel BuildRequires: libjpeg-devel BuildRequires: tinyxml-devel -BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(freealut) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gtksourceview-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libpng12) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(x11) @@ -37,7 +39,8 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(xml2po) -BuildRequires: ImageMagick +BuildRequires: qt5-qtbase-devel +BuildRequires: readline-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: libxslt @@ -99,18 +102,19 @@ sed -e 's|share/games/openclonk|share/openclonk|g' -i CMakeLists.txt cp -p planet/COPYING COPYING-planet -## Strip all .png files -## 'iCCP: known incorrect sRGB profile' warnings -find . -type f -name "*.png" -exec convert {} -strip {} \; - %build mkdir -p build && cd build -%cmake -Wno-cpp -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS" \ + +# -Werror=format-security/ flag prevents compilation +export LDFLAGS="$RPM_LD_FLAGS" +SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Werror=format-security/-Wno-error=format-security/g') +%cmake -Wno-cpp -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING="$SETOPT_FLAGS" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="$RPM_LD_FLAGS" \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DCMAKE_SKIP_RPATH:BOOL=YES -DWITH_AUTOMATIC_UPDATE:BOOL=OFF \ - -DUSE_X11:BOOL=ON -DUSE_GTK:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DUSE_STATIC_BOOST=OFF -DUSE_SYSTEM_TINYXML=ON .. + -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DUSE_GCC_STYLE_LTCG:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=NO -DWITH_AUTOMATIC_UPDATE:BOOL=OFF \ + -DUSE_X11:BOOL=ON -DUSE_GTK:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=NO \ + -DUSE_STATIC_BOOST=OFF -DUSE_SYSTEM_TINYXML=ON \ + -DSTACK_DETAILS_AUTO_DETECT:BOOL=FALSE .. %make_build @@ -123,47 +127,14 @@ make %{?_smp_mflags} chm/en/Developer.chm popd %install -make -C build DESTDIR=$RPM_BUILD_ROOT install +%make_install -C build mv $RPM_BUILD_ROOT%{_prefix}/games/openclonk $RPM_BUILD_ROOT%{_bindir} desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -# Make an appdata file +# Move upstream appdata file to metainfo/ directory mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo -cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/%{name}.appdata.xml < - - - %{name}.desktop - CC0-1.0 - Multiplayer action, tactics and skill game - %{name} - ISC and CC-BY-SA - - Games - Web Browser - - -

- Clonk is a multiplayer-action-tactics-skill game. - It is often referred to as a mixture of The Settlers and Worms. - In a simple 2D antfarm-style landscape, the player controls - his crew of Clonks, small but robust humanoid beings. - The game encourages free play but the normal goal is to - either exploit valuable resources from the earth - by building a mine or fight each other on an arena-like map. -

- - http://www.openclonk.org/ - - https://sagitter.fedorapeople.org/%{name}-screenshots/%{name}1.png - https://sagitter.fedorapeople.org/%{name}-screenshots/%{name}6.png - https://sagitter.fedorapeople.org/%{name}-screenshots/%{name}3.png - https://sagitter.fedorapeople.org/%{name}-screenshots/%{name}4.png - https://sagitter.fedorapeople.org/%{name}-screenshots/%{name}5.png - - forum.openclonk.org - -EOF +mv $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/appdata appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml @@ -211,8 +182,10 @@ install -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-docs.pn %{_datadir}/pixmaps/%{name}-docs.png %changelog -* Thu Feb 08 2018 Fedora Release Engineering - 7.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri Feb 09 2018 Martin Gansser - 8.0-1 +- Update to version 8.0 +- Disable Werror=format-security flag (https://github.com/openclonk/openclonk/issues/64) +- Use appdata file from upstream * Thu Jan 18 2018 Igor Gnatenko - 7.0-10 - Remove obsolete scriptlets diff --git a/sources b/sources index 2dc39bb..3c5f320 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openclonk-7.0.tar.gz) = 7628c8a1cd12581085652eb38eea6133610857b8816b81baefccddf0dd05a0a4f38669b9bd382a3365f7a5a7c939a7d443f22c9dc596b0533988091f7e405251 +SHA512 (openclonk-8.0.tar.gz) = d6a0e1cd922872451ec4583656ec942a95a27b6996aa132b35a5551a818d9abc395a08b484031150a070c0020443f2301d2d8d6a7732494dd3d0337c99e7b420