From 6f6ec34cdc0c4a1de2c179ddcc454eb2ac6068872fdbd5841777477526d8a14c Mon Sep 17 00:00:00 2001
From: Philip Taylor <excors@gmail.com>
Date: Sun, 8 Aug 2010 21:45:49 +0000
Subject: [PATCH] Fix build errors

OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=9
---
 0ad.spec       | 10 +++++++++-
 debian.install |  2 ++
 debian.rules   |  5 ++++-
 debian.tar.gz  |  3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 debian.tar.gz

diff --git a/0ad.spec b/0ad.spec
index 8b6bcff..290b19e 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -35,9 +35,9 @@ BuildRequires:  nasm
 BuildRequires:  python
 BuildRequires:  subversion
 BuildRequires:  zip
-BuildRequires:  update-desktop-files
 
 %if 0%{?suse_version}
+BuildRequires:  update-desktop-files
 BuildRequires:  libenet-devel
 BuildRequires:  openal-soft-devel
 BuildRequires:  pkg-config
@@ -52,6 +52,7 @@ BuildRequires:  libSDL-devel
 %endif
 
 %if 0%{?fedora_version}
+BuildRequires:  desktop-file-utils
 BuildRequires:  enet-devel
 BuildRequires:  openal-soft-devel
 BuildRequires:  pkgconfig
@@ -138,7 +139,13 @@ LD_LIBRARY_PATH=binaries/system binaries/system/test_dbg -libdir binaries/system
 %__install -Dm 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
 %__install -Dm 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
+%if 0%{?suse_version}
 %suse_update_desktop_file %{name}
+%endif
+
+%if 0%{?fedora_version}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%endif
 
 %__install -Dm 0755 %{SOURCE3} %{buildroot}%{_bindir}/0ad
 
@@ -158,4 +165,5 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
 %{_libdir}/%{name}/libmozjs-ps-debug.so
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
+%dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
diff --git a/debian.install b/debian.install
index ff7a52d..f783e66 100644
--- a/debian.install
+++ b/debian.install
@@ -3,3 +3,5 @@ usr/bin/pyrogenesis_dbg
 usr/lib/libAtlasUI_dbg.so
 usr/lib/libCollada_dbg.so
 usr/lib/libmozjs-ps-debug.so
+usr/share/pixmaps/0ad.png
+usr/share/application/0ad.desktop
diff --git a/debian.rules b/debian.rules
index 3781c5a..cf25ebc 100644
--- a/debian.rules
+++ b/debian.rules
@@ -62,7 +62,10 @@ install: build
 	install -Dm 0755 binaries/system/libAtlasUI_dbg.so $(CURDIR)/debian/tmp/usr/lib/libAtlasUI_dbg.so
 	install -Dm 0755 binaries/system/libmozjs-ps-debug.so $(CURDIR)/debian/tmp/usr/lib/libmozjs-ps-debug.so
 
-	ln -s /usr/bin/pyrogenesis_dbg  $(CURDIR)/debian/tmp/usr/bin/0ad
+	install -Dm 0755 debian/0ad.sh $(CURDIR)/debian/tmp/usr/bin/0ad
+
+	install -Dm 0644 debian/0ad.png $(CURDIR)/debian/tmp/usr/share/pixmaps/0ad.png
+	install -Dm 0644 debian/0ad.desktop $(CURDIR)/debian/tmp/usr/share/application/0ad.desktop
 
 
 # Build architecture-independent files here.
diff --git a/debian.tar.gz b/debian.tar.gz
new file mode 100644
index 0000000..6452608
--- /dev/null
+++ b/debian.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eddf91012e76b6d3baf045501f0e3f50d3343805ca88cfd0a4ea5c9f62eb6f06
+size 20480