X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=myplc.spec;h=5567fcb2ed9f0ae1815390af3f2c43bc6f95be33;hp=7ae509737a89f6b9b8ca2f7525175ac4373520a8;hb=HEAD;hpb=852e41ee4ff87d7f38bb82e7944723bfb0447553

diff --git a/myplc.spec b/myplc.spec
index 7ae5097..5567fcb 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,6 +1,6 @@
 %define name myplc
 %define version 5.3
-%define taglevel 4
+%define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -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: this package is designed for deployments that only need
-the API + db + www UI. Installing this will not require any node-oriented
-package, like bootcd, nodeiamge, or bootmanager.
+Summary: core contents of myplc with API + db + www UI
 
-% description core
-The core of myplc is about its API + database + web interface
-
-# 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
 
@@ -258,6 +260,9 @@ fi
 
 %files core
 %defattr(-,root,root,-)
+/usr/lib/systemd/system/plc.service
+/usr/bin/plc-ctl
+/etc/plc.d
 /etc/planetlab
 /etc/plc_sliceinitscripts
 /etc/support-scripts
@@ -287,6 +292,13 @@ fi
 
 
 %changelog
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - myplc-5.3-5
+- last version suitable for f27/f29 with python2
+- packaging is split up, one more rpm named 'myplc-core' is produced,
+- that covers the infrastructure side only (without bootcds and nodeimages and all node-oriented material)
+- no more init file, one systemd service only, that leverages new /usr/bin/plc-ctl
+- more robust config for httpd and php-fpm and php
+
 * Sun Jul 16 2017 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.3-4
 - takes care of creating plcapi log file