commit 798826884a5026ff336fb33d968ac22595e4b8c2
Author: Jacek Konieczny <[email protected]>
Date: Tue Apr 8 20:36:11 2014 +0200
Version: 0.5.0
openttd-opengfx-makefile.patch | 25 +++++++++++++++++++++++++
openttd-opengfx.spec | 12 +++++++-----
2 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/openttd-opengfx.spec b/openttd-opengfx.spec
index 48d098e..e847776 100644
--- a/openttd-opengfx.spec
+++ b/openttd-opengfx.spec
@@ -1,13 +1,14 @@
Summary: Open Source graphics base set for OpenTTD
Summary(pl.UTF-8): Otwarty zestaw grafiki dla OpenTTD
Name: openttd-opengfx
-Version: 0.4.7
+Version: 0.5.0
Release: 1
License: GPL v2+
Group: Applications/Games
-Source0:
http://bundles.openttdcoop.org/opengfx/releases/%{version}/opengfx-%{version}-source.tar.xz
-# Source0-md5: 7b09917405da8ab39a9f5958b95ac126
+Source0:
http://bundles.openttdcoop.org/opengfx/releases/%{version}/opengfx-%{version}-source.tar.gz
+# Source0-md5: 4700a9753e0bfeec1aa85f7fefe88bcd
Patch0: %{name}-docs.patch
+Patch1: %{name}-makefile.patch
URL: http://wiki.openttd.org/Graphics_Replacement
BuildRequires: grfcodec >= 5.0.0
BuildRequires: nml >= 0.2.4
@@ -36,7 +37,7 @@ prawami autorskimi.
%prep
%setup -q -n opengfx-%{version}-source
%patch0 -p1
-%{__sed} -i 's,$(INSTALL_DIR),$(DESTDIR)$(INSTALL_DIR),'
scripts/Makefile.bundles
+%patch1 -p1
%build
%{__make}
@@ -44,9 +45,10 @@ prawami autorskimi.
%install
rm -rf $RPM_BUILD_ROOT
+touch opengfx-%{version}.tar
%{__make} install \
INSTALL_DIR="%{_datadir}/openttd/data" \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR="$RPM_BUILD_ROOT"
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/openttd-opengfx-makefile.patch b/openttd-opengfx-makefile.patch
new file mode 100644
index 0000000..b2493f1
--- /dev/null
+++ b/openttd-opengfx-makefile.patch
@@ -0,0 +1,25 @@
+diff -dur opengfx-0.5.0-source.orig/Makefile opengfx-0.5.0-source/Makefile
+--- opengfx-0.5.0-source.orig/Makefile 2014-03-31 21:20:26.000000000 +0200
++++ opengfx-0.5.0-source/Makefile 2014-04-08 20:25:25.046918657 +0200
+@@ -240,7 +240,7 @@
+ #####################################################
+ lng: custom_tags.txt
+
+-custom_tags.txt: FORCE
++custom_tags.txt:
+ $(_E) "[LNG] $@"
+ $(_V) echo "VERSION :$(REPO_VERSION_STRING)" > $@
+ $(_V) echo "VERSION_STRING :$(REPO_VERSION_STRING)" >> $@
+@@ -532,9 +532,9 @@
+ $(_E) "Try calling 'make install -D INSTALL_DIR=path/to/install_dir'"
+ $(_V) false
+ endif
+- $(_E) "[INSTALL] to $(INSTALL_DIR)"
+- $(_V) install -d $(INSTALL_DIR)
+- $(_V) install -m644 $< $(INSTALL_DIR)
++ $(_E) "[INSTALL] to $(DESTDIR)$(INSTALL_DIR)"
++ $(_V) install -d $(DESTDIR)$(INSTALL_DIR)
++ $(_V) install -m644 $< $(DESTDIR)$(INSTALL_DIR)
+
+ # misc. convenience targets like 'langcheck'
+ -include $(SCRIPT_DIR)/Makefile_misc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openttd-opengfx.git/commitdiff/798826884a5026ff336fb33d968ac22595e4b8c2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
