From: parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 10 Dec 2018 16:25:05 +0000 (+0100)
Subject: still on the specfile; rpm doc about subpackages is not too exactly crystal clear..
X-Git-Tag: myplc-5.3-5~1
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=f31eb1f0d8095fcb50ee026bb43a26b7de82140c

still on the specfile; rpm doc about subpackages is not too exactly crystal clear..
---

diff --git a/myplc.spec b/myplc.spec
index 8a541f3..df27265 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -26,17 +26,17 @@ Summary: PlanetLab Central (PLC) Portable Installation
 Group: Applications/Systems
 
 # planetlab stuff
+Requires: myplc-docs
+Requires: myplc-release
+Requires: myplc-core
+Requires: createrepo
 Requires: bootmanager
 Requires: bootcd-%{nodefamily}
 Requires: bootcd-initscripts
-Requires: www-register-wizard
+Requires: nodeimage-%{nodefamily}
 Requires: nodeconfig
 Requires: nodeyum
-Requires: nodeimage-%{nodefamily}
-Requires: myplc-docs
-Requires: myplc-release
-Requires: myplc-core
-Requires: createrepo
+Requires: www-register-wizard
 
 
 # starting with f16 we depend on this new rpm
@@ -45,8 +45,6 @@ Requires: rpm-sign
 %endif
 
 
-%define debug_package %{nil}
-
 %description
 MyPLC is a complete PlanetLab Central (PLC) portable installation.
 The default installation consists of a web server, an XML-RPC API
@@ -57,17 +55,15 @@ single System V init script.
 
 
 ####################### myplc-core
+# Warning: it appears that Requires should come here
+# BEFORE the %description thingy
 
 %package core
 
 Summary: core contents of myplc with API + db + www UI
 
-%description core
-The core of myplc is about its API + database + web interface.
-Installing this will not require any node-oriented
-package, like bootcd, nodeimage, or bootmanager.
-
-# as much as possible, requires should go in the subpackages specfile
+# as much as possible, requires should have gone
+# with the individual packages, but well
 Requires: myplc-config
 Requires: plcapi
 Requires: plewww
@@ -115,6 +111,11 @@ Requires: ed
 Requires: cronie
 
 
+%description core
+The core of myplc is about its API + database + web interface.
+Installing this will not require any node-oriented
+package, like bootcd, nodeimage, or bootmanager.
+
 ####################### myplc-config
 
 %package config
@@ -127,6 +128,7 @@ Requires: python
 This package provides the Python module to configure MyPLC.
 
 
+
 %prep
 %setup -q