SHA256
1
0
forked from pool/lugaru

Accepting request 446786 from home:Pharaoh_Atem:branches:games

Lugaru 1.1 was released (https://gitlab.com/osslugaru/lugaru/tags/1.1) so now lugaru is rebased to v1.1. 

Please process https://build.opensuse.org/request/show/446396 before accepting this one. The separate lugaru-data spec is no longer necessary, as the content is now CC-BY-SA, and thus can be  part of the main tarball. Thus, lugaru-data is now a subpackage of lugaru.

OBS-URL: https://build.opensuse.org/request/show/446786
OBS-URL: https://build.opensuse.org/package/show/games/lugaru?expand=0&rev=13
This commit is contained in:
Adam Mizerski 2016-12-17 15:33:02 +00:00 committed by Git OBS Bridge
parent c65d35abac
commit d19a264814
11 changed files with 198 additions and 162 deletions

View File

@ -1,3 +1,13 @@
<services> <services>
<service name="tar_scm"><param name="include">CMakeLists.txt</param><param name="url">https://code.google.com/p/lugaru/</param><param name="scm">hg</param><param name="include">cmake/*</param><param name="versionformat">1.0.rev{rev}</param><param name="include">COPYING.txt</param><param name="include">Source/*</param></service> <service name="tar_scm">
<service name="recompress"><param name="file">*.tar</param><param name="compression">bz2</param></service><service name="set_version"/></services> <param name="scm">git</param>
<param name="url">https://gitlab.com/osslugaru/lugaru.git</param>
<param name="revision">refs/tags/1.1</param>
<param name="versionformat">@PARENT_TAG@</param>
</service>
<service name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version"/>
</services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:723f241e7c4dab310eea3edabad06672d0644b643438aaf69d31247521401d09
size 461244

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a6568c78f90f1af6cadcb3de2c5378996709842aae9e74e3d6beb1c29efa14a
size 34386828

View File

@ -1,7 +1,8 @@
# #
# spec file for package lugaru # spec file for package lugaru
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 Neal Gompa <ngompa13@gmail.com>.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,38 +18,42 @@
Name: lugaru Name: lugaru
Summary: Kung-Fu Rabbit Adventure Video Game Version: 1.1
License: GPL-2.0
Group: Amusements/Games/Action/Other
%define main_version 1.0
Version: 1.0.rev506
Release: 0 Release: 0
Url: http://code.google.com/p/lugaru/ Summary: Third person ninja rabbit fighting game
# revision 275 License: GPL-2.0+
Source: %{name}-%{version}.tar.bz2 Group: Amusements/Games/Action/Other
Source1: %{name}.desktop Url: https://osslugaru.gitlab.io/
# PATCH-FIX-UPSTREAM lugaru-1.0.rev225-cmake-fix.patch adam@mizerski.pl -- Fix detecting GLU Source: %{name}-%{version}.tar.xz
Patch0: lugaru-1.0.rev225-cmake-fix.patch # PATCH-FIX-OPENSUSE lugaru-1.1-do-not-install-documentation.patch ngompa13@gmail.com -- Don't try to install docs, as we're doing it ourselves
# PATCH-FIX-OPENSUSE lugaru-1.0-dont-install-data.patch adam@mizerski.pl -- Don't try to install Data, since it's in lugaru-1.0-data package Patch0: lugaru-1.1-do-not-install-documentation.patch
Patch1: lugaru-1.0-dont-install-data.patch
# PATCH-FIX-UPSTREAM lugaru-1.0.rev506-no-return.patch kkirill@opensuse.org -- Add missing return statement
Patch2: lugaru-1.0.rev506-no-return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libSDL-devel # Icon is installed into hicolor-icon-theme path
BuildRequires: hicolor-icon-theme
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libogg-devel BuildRequires: pkgconfig
BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
BuildRequires: openal-soft-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: zlib-devel BuildRequires: pkgconfig(glu)
Provides: %{name} = %{main_version} BuildRequires: pkgconfig(libpng)
Requires: %{name}-data = %{main_version} BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisfile)
BuildRequires: pkgconfig(zlib)
Requires: hicolor-icon-theme
# Require Lugaru game content
Requires: %{name}-data = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
# Ensure cache is updated
Requires(post): hicolor-icon-theme
Requires(postun): hicolor-icon-theme
%endif
%description %description
Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth). Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth).
@ -58,43 +63,60 @@ those responsible for slaughtering his village, he uncovers a far-reaching consp
corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it
upon himself to fight against their plot and save his fellow rabbits from slavery. upon himself to fight against their plot and save his fellow rabbits from slavery.
%package data
Summary: Arch-independent data files for the Lugaru game
Group: Amusements/Games/Action/Other
%if 0%{?suse_version} && 0%{?suse_version} <= 1310
License: CC-BY-SA-3.0+
%else
License: CC-BY-SA-3.0 and CC-BY-SA-4.0
%endif
Requires: %{name} = %{version}
BuildArch: noarch
%description data
This package contains arch-independent data files for the game Lugaru.
%prep %prep
%setup -q %setup -q
%patch0 %patch0 -p1
%patch1
%patch2
%build %build
export CFLAGS="$RPM_OPT_FLAGS" # Ensure that it looks in the right place for the game data
export CXXFLAGS="$RPM_OPT_FLAGS" %cmake -DSYSTEM_INSTALL=ON \
cmake -DLUGARU_INSTALL_PREFIX=%{_libdir}/%{name} -G "Unix Makefiles" -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name}
%__make VERBOSE=1 %{?_smp_mflags}
make VERBOSE=1 %{?_smp_mflags}
%install %install
%makeinstall %make_install -C build
mkdir -p %{buildroot}%{_datadir}/%{name}-data
%__ln_s %{_datadir}/%{name}-data %{buildroot}%{_libdir}/%{name}/Data %fdupes %{buildroot}%{_datadir}
%__install -D -d %{buildroot}%{_bindir}
%__cat >%{buildroot}%{_bindir}/%{name} <<EOF
#!/bin/bash
cd %{_libdir}/%{name}/
./%{name}
EOF
%__chmod +x %{buildroot}%{_bindir}/%{name}
%__install -D -m 644 Source/win-res/Lugaru.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file %{name} %suse_update_desktop_file %{name}
%post
%icon_theme_cache_post
%postun
%icon_theme_cache_postun
%endif %endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING.txt %doc COPYING.txt AUTHORS RELEASE-NOTES.md Docs/*
%{_bindir}/%{name} %{_bindir}/%{name}
%dir %{_libdir}/%{name} %dir %{_datadir}/appdata
%{_libdir}/%{name}/* %{_datadir}/appdata/%{name}.appdata.xml
%dir %{_datadir}/%{name}-data
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_mandir}/man6/%{name}.6*
%files data
%defattr(-,root,root)
%doc CONTENT-LICENSE.txt
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%changelog %changelog

View File

@ -1,15 +0,0 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -550,10 +550,6 @@ else(WIN32)
endif(APPLE AND LUGARU_HAS_INTERNAL_SDL)
endif(WIN32)
-if(NOT APPLE)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif(NOT APPLE)
-
if(APPLE)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${APPS_ROOT})
endif(APPLE)

View File

@ -1,19 +0,0 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -415,9 +415,11 @@ if (NOT ZLIB_FOUND)
endif (NOT ZLIB_FOUND)
option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
-if (LUGARU_FORCE_INTERNAL_GLU)
- set(OPENGL_GLU_FOUND False)
-endif (LUGARU_FORCE_INTERNAL_GLU)
+if (NOT LUGARU_FORCE_INTERNAL_GLU)
+ find_package(GLU)
+else(NOT LUGARU_FORCE_INTERNAL_GLU)
+ set(OPENGL_GLU_FOUND False)
+endif (NOT LUGARU_FORCE_INTERNAL_GLU)
if (NOT OPENGL_GLU_FOUND)
message(STATUS "Using internal copy of libGLU")

View File

@ -1,12 +0,0 @@
Index: Source/Game.cpp
===================================================================
--- Source/Game.cpp.orig
+++ Source/Game.cpp
@@ -328,6 +328,7 @@ int Game::thread(void *data) {
if(pt) {
(pt->game->*(pt->method))();
}
+ return 0;
}
void Game::DrawGL() {

View File

@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5869354..5e4f99a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,16 +291,3 @@ if(APPLE)
install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Lugaru.icns DESTINATION ${LUGARU_RESDIR})
install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents)
endif(APPLE)
-
-# Documentation
-
-install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS
- ${CMAKE_SOURCE_DIR}/CONTENT-LICENSE.txt
- ${CMAKE_SOURCE_DIR}/COPYING.txt
- ${CMAKE_SOURCE_DIR}/README.md
- ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.md
- ${CMAKE_SOURCE_DIR}/Docs/DEVTOOLS.txt
- ${CMAKE_SOURCE_DIR}/Docs/README.Empire.txt
- ${CMAKE_SOURCE_DIR}/Docs/README.SevenTasks.txt
- ${CMAKE_SOURCE_DIR}/Docs/README.Temple.txt
- DESTINATION ${LUGARU_DOCDIR})

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Dec 16 22:48:19 UTC 2016 - ngompa13@gmail.com
- Apply corrections to the spec based on spec-cleaner run
-------------------------------------------------------------------
Thu Dec 15 13:17:34 UTC 2016 - ngompa13@gmail.com
- Merge lugaru-data into lugaru spec as subpackage
-------------------------------------------------------------------
Thu Dec 15 11:06:02 UTC 2016 - ngompa13@gmail.com
- update to official 1.1 release
- update source service to pull from official git repository
- dropped all old patches
- added lugaru-1.1-do-not-install-documentation.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 14 07:51:14 UTC 2012 - kkirill@opensuse.org Sat Jul 14 07:51:14 UTC 2012 - kkirill@opensuse.org

View File

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Lugaru
GenericName=Third-Person Action Game
GenericName[ru]=Драки от 3-его лица
Comment=Kung-Fu Rabbit 3D Action Game
Comment[ru]=3-х мерная аркадная игра про кунг-фу кролика
Icon=lugaru
Exec=lugaru
Categories=Game;ActionGame;

View File

@ -1,7 +1,8 @@
# #
# spec file for package lugaru # spec file for package lugaru
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 Neal Gompa <ngompa13@gmail.com>.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,38 +18,42 @@
Name: lugaru Name: lugaru
Summary: Kung-Fu Rabbit Adventure Video Game Version: 1.1
License: GPL-2.0
Group: Amusements/Games/Action/Other
%define main_version 1.0
Version: 1.0
Release: 0 Release: 0
Url: http://code.google.com/p/lugaru/ Summary: Third person ninja rabbit fighting game
# revision 275 License: GPL-2.0+
Source: %{name}-%{version}.tar.bz2 Group: Amusements/Games/Action/Other
Source1: %{name}.desktop Url: https://osslugaru.gitlab.io/
# PATCH-FIX-UPSTREAM lugaru-1.0.rev225-cmake-fix.patch adam@mizerski.pl -- Fix detecting GLU Source: %{name}-%{version}.tar.xz
Patch0: lugaru-1.0.rev225-cmake-fix.patch # PATCH-FIX-OPENSUSE lugaru-1.1-do-not-install-documentation.patch ngompa13@gmail.com -- Don't try to install docs, as we're doing it ourselves
# PATCH-FIX-OPENSUSE lugaru-1.0-dont-install-data.patch adam@mizerski.pl -- Don't try to install Data, since it's in lugaru-1.0-data package Patch0: lugaru-1.1-do-not-install-documentation.patch
Patch1: lugaru-1.0-dont-install-data.patch
# PATCH-FIX-UPSTREAM lugaru-1.0.rev506-no-return.patch kkirill@opensuse.org -- Add missing return statement
Patch2: lugaru-1.0.rev506-no-return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libSDL-devel # Icon is installed into hicolor-icon-theme path
BuildRequires: hicolor-icon-theme
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libogg-devel BuildRequires: pkgconfig
BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
BuildRequires: openal-soft-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: zlib-devel BuildRequires: pkgconfig(glu)
Provides: %{name} = %{main_version} BuildRequires: pkgconfig(libpng)
Requires: %{name}-data = %{main_version} BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisfile)
BuildRequires: pkgconfig(zlib)
Requires: hicolor-icon-theme
# Require Lugaru game content
Requires: %{name}-data = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
# Ensure cache is updated
Requires(post): hicolor-icon-theme
Requires(postun): hicolor-icon-theme
%endif
%description %description
Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth). Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth).
@ -58,43 +63,60 @@ those responsible for slaughtering his village, he uncovers a far-reaching consp
corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it
upon himself to fight against their plot and save his fellow rabbits from slavery. upon himself to fight against their plot and save his fellow rabbits from slavery.
%package data
Summary: Arch-independent data files for the Lugaru game
Group: Amusements/Games/Action/Other
%if 0%{?suse_version} && 0%{?suse_version} <= 1310
License: CC-BY-SA-3.0+
%else
License: CC-BY-SA-3.0 and CC-BY-SA-4.0
%endif
Requires: %{name} = %{version}
BuildArch: noarch
%description data
This package contains arch-independent data files for the game Lugaru.
%prep %prep
%setup -q %setup -q
%patch0 %patch0 -p1
%patch1
%patch2
%build %build
export CFLAGS="$RPM_OPT_FLAGS" # Ensure that it looks in the right place for the game data
export CXXFLAGS="$RPM_OPT_FLAGS" %cmake -DSYSTEM_INSTALL=ON \
cmake -DLUGARU_INSTALL_PREFIX=%{_libdir}/%{name} -G "Unix Makefiles" -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name}
%__make VERBOSE=1 %{?_smp_mflags}
make VERBOSE=1 %{?_smp_mflags}
%install %install
%makeinstall %make_install -C build
mkdir -p %{buildroot}%{_datadir}/%{name}-data
%__ln_s %{_datadir}/%{name}-data %{buildroot}%{_libdir}/%{name}/Data %fdupes %{buildroot}%{_datadir}
%__install -D -d %{buildroot}%{_bindir}
%__cat >%{buildroot}%{_bindir}/%{name} <<EOF
#!/bin/bash
cd %{_libdir}/%{name}/
./%{name}
EOF
%__chmod +x %{buildroot}%{_bindir}/%{name}
%__install -D -m 644 Source/win-res/Lugaru.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file %{name} %suse_update_desktop_file %{name}
%post
%icon_theme_cache_post
%postun
%icon_theme_cache_postun
%endif %endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING.txt %doc COPYING.txt AUTHORS RELEASE-NOTES.md Docs/*
%{_bindir}/%{name} %{_bindir}/%{name}
%dir %{_libdir}/%{name} %dir %{_datadir}/appdata
%{_libdir}/%{name}/* %{_datadir}/appdata/%{name}.appdata.xml
%dir %{_datadir}/%{name}-data
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_mandir}/man6/%{name}.6*
%files data
%defattr(-,root,root)
%doc CONTENT-LICENSE.txt
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%changelog %changelog