[grfcodec] - update to new upstream release - contains mostly fixes for downstream packagers (like us)

[Felix Kaechele]

commit 9c1f7cded6ed0efe8ddc63d94a289723b4d23fa0
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Fri Aug 27 14:38:12 2010 +0200

    - update to new upstream release
    - contains mostly fixes for downstream packagers (like us)

 .gitignore         |    1 +
 fedora-build.patch |   51 ---------------------------------------------------
 grfcodec.spec      |   48 ++++++++++++++++++++++++------------------------
 sources            |    2 +-
 4 files changed, 26 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ece404..95f80e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 grfcodec-r2306.tar.gz
+/grfcodec-1.0.0-source.tar.gz
diff --git a/grfcodec.spec b/grfcodec.spec
index 16f2544..982b88f 100644
--- a/grfcodec.spec
+++ b/grfcodec.spec
@@ -1,20 +1,14 @@
-%global svnrev  r2306
 Name:           grfcodec
-Version:        0.9.11
-Release:        0.4.%{svnrev}%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        A suite of programs to modify Transport Tycoon Deluxe's GRF files
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.ttdpatch.net/grfcodec/
-# svn export -r2294 svn://svn.ttdpatch.net/misc/grfcodec
-# tar -czf grfcodec-r2294.tar.gz grfcodec
-Source0:        grfcodec-%{svnrev}.tar.gz
-# ignore upx failures; don't pass -O3 to gcc
-Patch0:         fedora-build.patch
+URL:            http://dev.openttdcoop.org/projects/grfcodec
+Source0:        http://binaries.openttd.org/extra/grfcodec/%{version}/grfcodec-%{version}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
-BuildRequires:  upx
 
 
 %description
@@ -22,25 +16,25 @@ A suite of programs to modify Transport Tycoon Deluxe's GRF files.
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p 1 -b .fedora
-
-for f in *.txt; do
-  iconv -f iso8859-1 -t utf-8 $f >$f.conv 
-  touch -r $f $f.conv
-  mv $f.conv $f
-done
+%setup -q -n %{name}-%{version}-source
 
 
 %build
-V=1 CFLAGAPP="%{optflags}" make %{?_smp_mflags}
+cat << EOF >> Makefile.local
+STRIP=true
+V=1
+CXXFLAGS=%{optflags}
+EOF
+
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-for file in grfcodec grfdiff grfmerge; do
-  install -D -m 755 $file %{buildroot}%{_bindir}/$file
-done
+make install DESTDIR=%{buildroot}
+
+# docs are installed by %%doc
+rm -rf %{buildroot}%{_docdir}/%{name}
 
 
 %clean
@@ -49,11 +43,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog COPYING grfcodec.txt grftut.txt grf.txt todo.txt
-%{_bindir}/*
+%doc changelog.txt COPYING
+%doc docs/*.txt
+%{_bindir}/grf*
+%{_mandir}/man1/grf*.1.gz
 
 
 %changelog
+* Fri Aug 27 2010 Felix Kaechele <heffer at fedoraproject.org> - 1.0.0-1
+- update to new upstream release
+- contains mostly fixes for downstream packagers (like us)
+
 * Sat Mar 20 2010 Iain Arnell <iarnell at gmail.com> 0.9.11-0.4.r2306
 - update to r2306 (fixes off-by-one error in byte escape)
 
diff --git a/sources b/sources
index 1859548..ef1c12d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a3b02049157bdd687f2748eafa5d90e  grfcodec-r2306.tar.gz
+a7689a1036ca950d645890df0d70af59  grfcodec-1.0.0-source.tar.gz