From 092ed7a561b4d6527ec9d1761bd71f9d0f804c7a Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 21 Sep 2013 05:54:36 +0000
Subject: Fix rpm.spec subpackages.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2677
---
 rpm.spec.in | 98 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 58 insertions(+), 40 deletions(-)

(limited to 'rpm.spec.in')

diff --git a/rpm.spec.in b/rpm.spec.in
index 11ed2cd7..effe042c 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -13,26 +13,6 @@ Prefix: %{_prefix}
 Autoreq: 0
 Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
 
-%description
-%(sed -n "/==/ q; p " < README)
-
-See @PACKAGE_URL@ for more information.
-
-%package -n @PROGRAM_PREFIX@heretic
-Summary: @PACKAGE_SHORTDESC@ (Heretic binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%package -n @PROGRAM_PREFIX@hexen
-Summary: @PACKAGE_SHORTDESC@ (Hexen binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%package -n @PROGRAM_PREFIX@strife
-Summary: @PACKAGE_SHORTDESC@ (Strife binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
 %prep
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,12 +41,22 @@ make
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%description
+%(sed -n "/==/ q; p " < README)
+
+See @PACKAGE_URL@ for more information.
+
+%package -n @PROGRAM_PREFIX@heretic
+Summary: @PACKAGE_SHORTDESC@ (Heretic binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
 %files
-%{_mandir}/man5/@PROGRAM_PREFIX@doom.cfg.5
-%{_mandir}/man5/default.cfg.5
-%{_mandir}/man6/@PROGRAM_PREFIX@doom.6
-%{_mandir}/man6/@PROGRAM_PREFIX@server.6
-%{_mandir}/man6/@PROGRAM_PREFIX@doom-setup.6
+%{_mandir}/man5/@PROGRAM_PREFIX@doom.cfg.5*
+%{_mandir}/man5/default.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@doom.6*
+%{_mandir}/man6/@PROGRAM_PREFIX@setup.6*
+%{_mandir}/man6/@PROGRAM_PREFIX@server.6*
 /usr/share/doc/@PACKAGE@/*
 /usr/games/@PROGRAM_PREFIX@doom
 /usr/games/@PROGRAM_PREFIX@server
@@ -74,29 +64,57 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/icons/*
 /usr/share/applications/*
 
-%files @PROGRAM_PREFIX@heretic
-%{_mandir}/man5/@PROGRAM_PREFIX@heretic.cfg.5
-%{_mandir}/man5/heretic.cfg.5
-%{_mandir}/man6/@PROGRAM_PREFIX@heretic.6
-%{_mandir}/man6/@PROGRAM_PREFIX@heretic-setup.6
+%description -n @PROGRAM_PREFIX@heretic
+%(sed -n "/==/ q; p " < README)
+
+These are the Heretic binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@heretic
+%{_mandir}/man5/@PROGRAM_PREFIX@heretic.cfg.5*
+%{_mandir}/man5/heretic.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@heretic.6*
 /usr/share/doc/@PROGRAM_PREFIX@heretic/*
 /usr/games/@PROGRAM_PREFIX@heretic
 /usr/games/@PROGRAM_PREFIX@heretic-setup
 
-%files @PROGRAM_PREFIX@hexen
-%{_mandir}/man5/@PROGRAM_PREFIX@hexen.cfg.5
-%{_mandir}/man5/hexen.cfg.5
-%{_mandir}/man6/@PROGRAM_PREFIX@hexen.6
-%{_mandir}/man6/@PROGRAM_PREFIX@hexen-setup.6
+%package -n @PROGRAM_PREFIX@hexen
+Summary: @PACKAGE_SHORTDESC@ (Hexen binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%description -n @PROGRAM_PREFIX@hexen
+%(sed -n "/==/ q; p " < README)
+
+These are the Hexen binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@hexen
+%{_mandir}/man5/@PROGRAM_PREFIX@hexen.cfg.5*
+%{_mandir}/man5/hexen.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@hexen.6*
 /usr/share/doc/@PROGRAM_PREFIX@hexen/*
 /usr/games/@PROGRAM_PREFIX@hexen
 /usr/games/@PROGRAM_PREFIX@hexen-setup
 
-%files @PROGRAM_PREFIX@strife
-%{_mandir}/man5/@PROGRAM_PREFIX@strife.cfg.5
-%{_mandir}/man5/strife.cfg.5
-%{_mandir}/man6/@PROGRAM_PREFIX@strife.6
-%{_mandir}/man6/@PROGRAM_PREFIX@strife-setup.6
+%package -n @PROGRAM_PREFIX@strife
+Summary: @PACKAGE_SHORTDESC@ (Strife binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%description -n @PROGRAM_PREFIX@strife
+%(sed -n "/==/ q; p " < README)
+
+These are the Strife binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@strife
+%{_mandir}/man5/@PROGRAM_PREFIX@strife.cfg.5*
+%{_mandir}/man5/strife.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@strife.6*
 /usr/share/doc/@PROGRAM_PREFIX@strife/*
 /usr/games/@PROGRAM_PREFIX@strife
 /usr/games/@PROGRAM_PREFIX@strife-setup
-- 
cgit v1.2.3