- up to 0.6.1

diff --git a/openttd-opengfx-docs.patch b/openttd-opengfx-docs.patch
deleted file mode 100644 (file)
index 8f608ee..0000000
--- a/openttd-opengfx-docs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- opengfx-0.3.1-source/scripts/Makefile.bundles~     2010-09-20 14:04:09.208115920 +0200
-+++ opengfx-0.3.1-source/scripts/Makefile.bundles      2010-09-20 14:09:17.620593892 +0200
-@@ -50,27 +50,6 @@
-       $(_E) "[INSTALL] to $(INSTALL_DIR)"
-       $(_V) install -d $(INSTALL_DIR)
-       $(_V) install -m644 $(TARGET_FILES) $(INSTALL_DIR)
--ifndef DO_NOT_INSTALL_DOCS
--ifneq ($(filter-out $(LICENSE_FILE) $(CHANGELOG_FILE),$(DOC_FILES)),)
--      $(_E) [INSTALL] docs to $(DOCDIR)
--      $(_V) install -d $(DOCDIR)
--      $(_V) install -m644 $(filter-out $(LICENSE_FILE) $(CHANGELOG_FILE),$(DOC_FILES)) $(DOCDIR)
--endif
--endif
--ifndef DO_NOT_INSTALL_LICENSE
--ifneq ($(LICENSE_FILE),)
--      $(_E) [INSTALL] license to $(DOCDIR)
--      $(_V) install -d $(DOCDIR)
--      $(_V) install -m644 $(LICENSE_FILE) $(DOCDIR)
--endif
--endif
--ifndef DO_NOT_INSTALL_CHANGELOG
--ifneq ($(CHANGELOG_FILE),)
--      $(_E) [INSTALL] changelog to $(DOCDIR)
--      $(_V) install -d $(DOCDIR)
--      $(_V) install -m644 $(CHANGELOG_FILE) $(DOCDIR)
--endif
--endif
- 
- 
- ################################################################

diff --git a/openttd-opengfx-makefile.patch b/openttd-opengfx-makefile.patch
deleted file mode 100644 (file)
index b2493f1..0000000
--- a/openttd-opengfx-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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

diff --git a/openttd-opengfx.spec b/openttd-opengfx.spec
index e847776233601ae1ad02b9296c875c228edf8bdf..b204b26e275423a5208388cb0523e06e66e725df 100644 (file)
--- a/openttd-opengfx.spec
+++ b/openttd-opengfx.spec
@@ -1,22 +1,20 @@
 Summary:       Open Source graphics base set for OpenTTD
 Summary(pl.UTF-8):     Otwarty zestaw grafiki dla OpenTTD
 Name:          openttd-opengfx
-Version:       0.5.0
+Version:       0.6.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Games
-Source0:       http://bundles.openttdcoop.org/opengfx/releases/%{version}/opengfx-%{version}-source.tar.gz
-# Source0-md5: 4700a9753e0bfeec1aa85f7fefe88bcd
-Patch0:                %{name}-docs.patch
-Patch1:                %{name}-makefile.patch
+Source0:       https://cdn.openttd.org/opengfx-releases/%{version}/opengfx-%{version}-source.tar.xz
+# Source0-md5: 1d807ba8d79d440b93c3dfe68daa2bde
 URL:           http://wiki.openttd.org/Graphics_Replacement
 BuildRequires: grfcodec >= 5.0.0
-BuildRequires: nml >= 0.2.4
+BuildRequires: nml >= 0.5.0
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildConflicts:        gimp
-Requires:      openttd-data
+Requires:      openttd-data >= 1.2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,8 +34,6 @@ prawami autorskimi.
 
 %prep
 %setup -q -n opengfx-%{version}-source
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__make}
@@ -46,8 +42,9 @@ prawami autorskimi.
 rm -rf $RPM_BUILD_ROOT
 
 touch opengfx-%{version}.tar
+%define ogfxdir %{_datadir}/openttd/baseset/opengfx-%{version}
 %{__make} install \
-       INSTALL_DIR="%{_datadir}/openttd/data" \
+       INSTALL_DIR="$RPM_BUILD_ROOT%{ogfxdir}" \
        DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
@@ -55,5 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{changelog.txt,readme.txt}
-%{_datadir}/openttd/data
+%doc changelog.txt README.md
+%{_datadir}/openttd/baseset/opengfx-%{version}/opengfx.obg
+%{_datadir}/openttd/baseset/opengfx-%{version}/*.grf
+%{_datadir}/openttd/baseset/opengfx-%{version}/*.txt