From 890ed9c58b5bef1402d95570f183e1d5725ae422 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Thu, 20 Sep 2012 19:08:11 +1000
Subject: [PATCH] Simplify the spec file to suit Fedora guidelines

---
 trader.spec | 51 ++++++++++-----------------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/trader.spec b/trader.spec
index 341847e..940a0bf 100644
--- a/trader.spec
+++ b/trader.spec
@@ -6,86 +6,55 @@
 # ***********************************************************************
 
 # Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id$
+# $Id: trader.spec 487 2012-09-20 09:08:11Z john $
 
 # This file is distributed under the same licence as Star Traders itself:
 # the GNU General Public License, version 3 or later.
 
-# ***********************************************************************
-# Global definitions
-
-%define upstream_version   7.4
-%define normalised_version 7.4
-%define rpm_release_num    1
-%define is_prerelease      0
-
-
-# ***********************************************************************
-# Overall package information
 
 Name:           trader
-Version:        %{normalised_version}
-Release:        %{rpm_release_num}%{?dist}
+Version:        7.4
+Release:        2%{?dist}
 Summary:        Star Traders, a simple game of interstellar trading
 License:        GPLv3+
 Group:          Amusements/Games
 Url:            http://www.zap.org.au/software/trader/
+Source0:        ftp://ftp.zap.org.au/pub/trader/unix/trader-%{version}.tar.gz
 
-%if 0%{?is_prerelease}
-Source0:        ftp://ftp.zap.org.au/pub/trader/unix/prerelease/trader-%{upstream_version}.tar.gz
-%else
-Source0:        ftp://ftp.zap.org.au/pub/trader/unix/trader-%{upstream_version}.tar.gz
-%endif
+BuildRequires:  gettext ncurses-devel
+Provides:       bundled(gnulib)
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gettext
-BuildRequires:  gperf
-BuildRequires:  ncurses-devel
 
 %description
 Star Traders is a simple game of interstellar trading, where the objective
 is to create companies, buy and sell shares, borrow and repay money, in
 order to become the wealthiest player (the winner).
 
-# ***********************************************************************
-# Package preparation
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
 
-# ***********************************************************************
-# Build the package
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# ***********************************************************************
-# Install the package
 
 %install
 make DESTDIR=%{buildroot} install
 %find_lang %{name}
 
-# ***********************************************************************
-# Clean up from package building
-
-%clean
-rm -rf %{buildroot}
-
-# ***********************************************************************
-# Create the RPM archive
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING NEWS README
 %doc %{_mandir}/man6/trader.6*
 %{_bindir}/trader
 
-# ***********************************************************************
-# Package spec file information
 
 %changelog
+* Thu Sep 20 2012 John Zaitseff <J.Zaitseff@zap.org.au> - 7.4-2
+- Simplified the RPM spec file to suit Fedora guidelines.
+
 * Wed May 09 2012 John Zaitseff <J.Zaitseff@zap.org.au> - 7.4-1
 - Updated the RPM package for a new release of Star Traders: version 7.4.