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

Felix Kaechele heffer at fedoraproject.org
Fri Aug 27 11:09:07 UTC 2010


commit 50c03062c6a1a2aef0229bb1d4042a98cf1b2b8b
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Fri Aug 27 11:59:11 2010 +0200

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

 .gitignore    |    1 +
 nforenum.spec |   45 ++++++++++++++++++++++++++-------------------
 sources       |    2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f07516..e1f4dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 nforenum-r2294.tar.xz
+/nforenum-4.0.0-source.tar.gz
diff --git a/nforenum.spec b/nforenum.spec
index 693eea7..9e512bf 100644
--- a/nforenum.spec
+++ b/nforenum.spec
@@ -1,13 +1,11 @@
 Name:           nforenum
-Version:        3.4.7
-Release:        0.4.r2294%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        A format correcter and linter for the NFO language
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://users.tt-forums.net/dalestan/nforenum/
-# svn export -r2294 svn://svn.ttdpatch.net/misc/nforenum/
-# tar --xz -cf nforenum-r2294.tar.xz nforenum
-Source0:        nforenum-r2294.tar.xz
+URL:            http://dev.openttdcoop.org/projects/nforenum
+Source0:        http://binaries.openttd.org/extra/nforenum/%{version}/nforenum-%{version}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -22,26 +20,30 @@ errors that will cause TTDPatch to reject the GRF during the initialization or
 activation phases should be detected; if any are not, it is a bug and should be
 reported as such.
 Sprites that are too short, not of the correct type (real/pseudo/&c.), too
-long, or otherwise not in agreement with their data or the preceeding sprites
+long, or otherwise not in agreement with their data or the preceding sprites
 are all detected. 
 
-%prep
-%setup -q -n %{name}
 
-for f in doc/COMMANDS.en.txt; do
-  iconv -f iso8859-1 -t utf-8 $f >$f.conv 
-  touch -r $f $f.conv
-  mv $f.conv $f
-done
+%prep
+%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}
-install -D -m 755 renum %{buildroot}%{_bindir}/nforenum
+make install DESTDIR=%{buildroot}
+
+# docs are installed by %%doc
+rm -rf %{buildroot}%{_docdir}/%{name}
 
 
 %clean
@@ -50,12 +52,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt COPYING.txt TODO.txt
-%doc doc/
-%{_bindir}/*
+%doc changelog.txt COPYING 
+%doc docs/*.txt
+%{_bindir}/nforenum
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Fri Aug 27 2010 Felix Kaechele <heffer at fedoraproject.org> - 4.0.0-1
+- update to new upstream release
+- contains mostly fixes for downstream packagers (like us)
+
 * Mon Jan 18 2010 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.4.r2294
 - new snapshot fixes gcc 4.4 errors
 
diff --git a/sources b/sources
index e5859ca..24502b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4fe214b6fbf53fbfd3dfb2018839ac3  nforenum-r2294.tar.xz
+9dd7ec02f14256ca65e648b5de415eea  nforenum-4.0.0-source.tar.gz


More information about the scm-commits mailing list