From 0e7fdb27118072e7639c487159301fe55991104202d9b79c6ab2d3c2c1f60f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 13 Jan 2013 23:10:06 +0000 Subject: [PATCH] Accepting request 148289 from home:worldcitizen:branches:games Added BuildRequires libXcursor-devel as they are not automatically installed for openSUSE > 12.2 OBS-URL: https://build.opensuse.org/request/show/148289 OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=42 --- 0ad.changes | 6 ++++++ 0ad.spec | 60 +++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/0ad.changes b/0ad.changes index 8e84d31..f29ae26 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 13 09:33:32 UTC 2013 - joop.boonen@opensuse.org + +- Added BuildRequires libXcursor-devel as they are not + automatically installed for openSUSE > 12.2 + ------------------------------------------------------------------- Sun Dec 16 21:55:40 UTC 2012 - philip@zaynar.co.uk diff --git a/0ad.spec b/0ad.spec index fddd2b4..685b745 100644 --- a/0ad.spec +++ b/0ad.spec @@ -1,7 +1,7 @@ # # spec file for package 0ad # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,20 +21,23 @@ Version: 0.0.12 Release: 1.0 Url: http://play0ad.com/ Source: 0ad-%{version}-alpha-unix-build.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: DevIL-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ +%if 0%{?suse_version} > 1220 +BuildRequires: libXcursor-devel +%endif BuildRequires: libcurl-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libvorbis-devel -BuildRequires: libxml2-devel BuildRequires: nasm BuildRequires: python BuildRequires: subversion BuildRequires: zip +BuildRequires: pkgconfig(libxml-2.0) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: libenet-devel @@ -73,8 +76,8 @@ BuildRequires: libwxgtku2.8-devel %if 0%{?mandriva_version} < 201000 BuildRequires: libopenal-devel -%else: BuildRequires: openal-soft-devel +%else: %endif %if 0%{?mandriva_version} == 201000 @@ -83,26 +86,25 @@ BuildRequires: libopenal1-soft %endif -Requires: 0ad-data Summary: Free, Open-Source, Cross-Platform RTS Game of Ancient Warfare License: GPL-2.0+ Group: Amusements/Games/Strategy/Real Time +Requires: 0ad-data %description -0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform real-time -strategy (RTS) game of ancient warfare. In short, it is a historically-based -war/economy game that allows players to relive or rewrite the history of Western -civilizations, focusing on the years between 500 B.C. and 500 A.D. The project is -highly ambitious, involving state-of-the-art 3D graphics, detailed artwork, sound, +0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform real-time +strategy (RTS) game of ancient warfare. In short, it is a historically-based +war/economy game that allows players to relive or rewrite the history of Western +civilizations, focusing on the years between 500 B.C. and 500 A.D. The project is +highly ambitious, involving state-of-the-art 3D graphics, detailed artwork, sound, and a flexible and powerful custom-built game engine. -The game has been in development by Wildfire Games (WFG), a group of volunteer, -hobbyist game developers, since 2001. The code and data are available under the GPL -license, and the art, sound and documentation are available under CC-BY-SA. In short, -we consider 0 A.D. an an educational celebration of game development and ancient +The game has been in development by Wildfire Games (WFG), a group of volunteer, +hobbyist game developers, since 2001. The code and data are available under the GPL +license, and the art, sound and documentation are available under CC-BY-SA. In short, +we consider 0 A.D. an an educational celebration of game development and ancient history. - %prep %setup -q -n %{name}-%{version}-alpha @@ -111,7 +113,7 @@ export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" build/workspaces/update-workspaces.sh --bindir=%{_bindir} --datadir=%{_datadir}/%{name} --libdir=%{_libdir}/%{name} --with-system-enet pushd build/workspaces/gcc -%__make verbose=1 %{?_smp_mflags} +make verbose=1 %{?_smp_mflags} popd %check @@ -123,20 +125,20 @@ popd %install #makeinstall -%__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/libmozjs185-ps-release.so.1.0 %{buildroot}%{_libdir}/%{name}/libmozjs185-ps-release.so.1.0 -%__install -Dm 0755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so -%__install -Dm 0755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so -%__install -Dm 0755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so -%__install -Dm 0755 binaries/system/libnvtt.so %{buildroot}%{_libdir}/%{name}/libnvtt.so +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/libmozjs185-ps-release.so.1.0 %{buildroot}%{_libdir}/%{name}/libmozjs185-ps-release.so.1.0 +install -Dm 0755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so +install -Dm 0755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so +install -Dm 0755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so +install -Dm 0755 binaries/system/libnvtt.so %{buildroot}%{_libdir}/%{name}/libnvtt.so #__install -Dm 0755 binaries/system/ActorEditor %{buildroot}/%{_libexecdir}/%{name}/bin/ActorEditor #__install -Dm 0755 binaries/system/ColourTester %{buildroot}/%{_libexecdir}/%{name}/bin/ColourTester -%__install -Dm 0644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -%__install -Dm 0644 build/resources/0ad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -Dm 0644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -Dm 0644 build/resources/0ad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %if 0%{?suse_version} %suse_update_desktop_file %{name} @@ -146,10 +148,10 @@ popd desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %endif -%__install -Dm 0755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad +install -Dm 0755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad -%__mkdir_p %{buildroot}%{_libdir}/%{name} -%__mkdir_p %{buildroot}%{_datadir}/%{name} +mkdir -p %{buildroot}%{_libdir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name} %files %defattr(-,root,root)