Hello community, here is the log from the commit of package 0ad for openSUSE:Factory checked in at 2018-02-05 10:53:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/0ad (Old) and /work/SRC/openSUSE:Factory/.0ad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "0ad" Mon Feb 5 10:53:22 2018 rev:5 rq:572419 version:0.0.22 Changes: -------- --- /work/SRC/openSUSE:Factory/0ad/0ad.changes 2017-11-29 10:52:25.869148245 +0100 +++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2018-02-05 10:53:56.377701250 +0100 @@ -1,0 +2,12 @@ +Sat Feb 3 14:27:50 UTC 2018 - [email protected] + +- Enable nvidia-texture-tools only on supported archs + +------------------------------------------------------------------- +Fri Feb 2 06:06:05 UTC 2018 - [email protected] + +- Use system mozjs38, bundled one fails to build on TW +- Remove special handling for Leap 42.1 +- Pass compiler flags to bundled Collada + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 0ad.spec ++++++ --- /var/tmp/diff_new_pack.YSqg0t/_old 2018-02-05 10:53:57.545646629 +0100 +++ /var/tmp/diff_new_pack.YSqg0t/_new 2018-02-05 10:53:57.549646442 +0100 @@ -1,7 +1,7 @@ # # spec file for package 0ad # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,13 @@ # +# Enable NVTT only on arch supported by nvidia-texture-tools +%ifarch %{ix86} x86_64 ppc +%bcond_without enable_nvtt +%else +%bcond_with enable_nvtt +%endif + Name: 0ad Version: 0.0.22 Release: 0 @@ -39,9 +46,10 @@ BuildRequires: libjpeg-devel BuildRequires: libminiupnpc-devel BuildRequires: libpng-devel -BuildRequires: mozilla-nspr-devel BuildRequires: nasm +%if %{with enable_nvtt} BuildRequires: nvidia-texture-tools +%endif BuildRequires: pkgconfig BuildRequires: python BuildRequires: update-desktop-files @@ -52,7 +60,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(libxml-2.0) -#BuildRequires: pkgconfig(mozjs-38) +BuildRequires: pkgconfig(mozjs-38) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(tinygettext) @@ -80,15 +88,21 @@ %build export CFLAGS="%{optflags}" +# bundled Collada uses CCFLAGS +export CCFLAGS="%{optflags}" export CPPFLAGS="%{optflags} -fpermissive" build/workspaces/update-workspaces.sh \ %{?_smp_mflags} \ --bindir=%{_bindir} \ --datadir=%{_datadir}/%{name} \ --libdir=%{_libdir}/%{name} \ +%if %{with enable_nvtt} --with-system-nvtt \ - --with-system-tinygettext -# --with-system-mozjs38 +%else + --without-nvtt \ +%endif + --with-system-tinygettext \ + --with-system-mozjs38 pushd build/workspaces/gcc make verbose=1 %{?_smp_mflags} @@ -99,7 +113,6 @@ install -Dm 0755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis install -Dm 0755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so install -Dm 0755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so -install -Dm 0755 binaries/system/libmozjs38-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so install -Dm 0644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm 0644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml @@ -115,13 +128,7 @@ %files %defattr(-,root,root) %doc README.txt -%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 ) || ! 0%{?is_opensuse} -# Fix for Leap 42.1 or SLE (TODO: Drop if 42.1 is out of maintenance) -%doc LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt -%dir %{_datadir}/appdata -%else %license LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt -%endif %{_bindir}/0ad %{_bindir}/pyrogenesis %{_bindir}/ActorEditor
