ref: 092ed7a561b4d6527ec9d1761bd71f9d0f804c7a
parent: 0bbfb99e5667a5753b6556990e853d219e3e4f24
author: Simon Howard <[email protected]>
date: Sat Sep 21 01:54:36 EDT 2013
Fix rpm.spec subpackages. Subversion-branch: /branches/v2-branch Subversion-revision: 2677
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -13,26 +13,6 @@
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 @@
%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/@[email protected]-%{_mandir}/man5/default.cfg.5-%{_mandir}/man6/@[email protected]-%{_mandir}/man6/@[email protected]-%{_mandir}/man6/@[email protected]+%{_mandir}/man5/@[email protected]*+%{_mandir}/man5/default.cfg.5*+%{_mandir}/man6/@[email protected]*+%{_mandir}/man6/@[email protected]*+%{_mandir}/man6/@[email protected]*/usr/share/doc/@PACKAGE@/*
/usr/games/@PROGRAM_PREFIX@doom
/usr/games/@PROGRAM_PREFIX@server
@@ -74,29 +64,57 @@
/usr/share/icons/*
/usr/share/applications/*
-%files @PROGRAM_PREFIX@heretic
-%{_mandir}/man5/@[email protected]-%{_mandir}/man5/heretic.cfg.5-%{_mandir}/man6/@[email protected]-%{_mandir}/man6/@[email protected]+%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/@[email protected]*+%{_mandir}/man5/heretic.cfg.5*+%{_mandir}/man6/@[email protected]*/usr/share/doc/@PROGRAM_PREFIX@heretic/*
/usr/games/@PROGRAM_PREFIX@heretic
/usr/games/@PROGRAM_PREFIX@heretic-setup
-%files @PROGRAM_PREFIX@hexen
-%{_mandir}/man5/@[email protected]-%{_mandir}/man5/hexen.cfg.5-%{_mandir}/man6/@[email protected]-%{_mandir}/man6/@[email protected]+%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/@[email protected]*+%{_mandir}/man5/hexen.cfg.5*+%{_mandir}/man6/@[email protected]*/usr/share/doc/@PROGRAM_PREFIX@hexen/*
/usr/games/@PROGRAM_PREFIX@hexen
/usr/games/@PROGRAM_PREFIX@hexen-setup
-%files @PROGRAM_PREFIX@strife
-%{_mandir}/man5/@[email protected]-%{_mandir}/man5/strife.cfg.5-%{_mandir}/man6/@[email protected]-%{_mandir}/man6/@[email protected]+%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/@[email protected]*+%{_mandir}/man5/strife.cfg.5*+%{_mandir}/man6/@[email protected]*/usr/share/doc/@PROGRAM_PREFIX@strife/*
/usr/games/@PROGRAM_PREFIX@strife
/usr/games/@PROGRAM_PREFIX@strife-setup