X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=b3b9886d8373df90294d1d5105625a196bb1f95f;hb=82d099c7771dd3517bb300552e5b182f49bb27bc;hp=63e3227d3eb511b840ccfbc9d0c40a6f4323bfa6;hpb=97e355c3758aeef88211c8bd75c1b422ac8653b6;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 63e3227..b3b9886 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,10 +1,6 @@ -# -# $Id$ -%define url $URL$ - %define name myplc -%define version 5.0 -%define taglevel 11 +%define version 5.1 +%define taglevel 1 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -20,7 +16,7 @@ BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} %define nodefamily %{pldistro}-%{distroname}-%{_arch} @@ -29,6 +25,7 @@ Summary: PlanetLab Central (PLC) Portable Installation Group: Applications/Systems # as much as possible, requires should go in the subpackages specfile +Requires: redhat-lsb Requires: bzip2 Requires: tar Requires: less @@ -54,6 +51,7 @@ Requires: vim-minimal Requires: findutils Requires: xmlsec1 Requires: xmlsec1-openssl +Requires: ed %if "%{distro}" == "Fedora" && %{distrorelease} >= 10 Requires: cronie %else @@ -68,21 +66,20 @@ Requires: www-register-wizard Requires: nodeconfig Requires: nodeyum Requires: PLCAPI -Requires: bootstrapfs-%{nodefamily} +Requires: nodeimage-%{nodefamily} Requires: myplc-docs Requires: myplc-release Requires: myplc-config %define debug_package %{nil} -%description -MyPLC is a complete PlanetLab Central (PLC) portable installation -contained within a chroot jail. The default installation consists of a -web server, an XML-RPC API server, a boot server, and a database -server: the core components of PLC. The installation may be customized -through a graphical interface. All PLC services are started up and -shut down through a single System V init script installed in the host -system. +%description +MyPLC is a complete PlanetLab Central (PLC) portable installation. +The default installation consists of a web server, an XML-RPC API +server, a boot server, and a database server: the core components of +PLC. The installation may be customized through a graphical +interface. All PLC services are started up and shut down through a +single System V init script. ####################### myplc-config @@ -117,6 +114,7 @@ chmod 755 ${RPM_BUILD_ROOT}/usr/bin/* # Install initscript echo "* Installing plc initscript" install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc +install -D -m 644 plc.service ${RPM_BUILD_ROOT}/lib/systemd/system/plc.service # Install initscripts echo "* Installing plc.d initscripts" @@ -235,7 +233,6 @@ fi /usr/bin/db-config /usr/bin/dns-config /usr/bin/refresh-peer.py* -/usr/bin/partial-repo.sh /usr/bin/mtail.py* /usr/bin/plc-map.py* /usr/bin/plc-kml.py* @@ -244,6 +241,7 @@ fi /usr/bin/plc-orphan-accounts.py* /usr/bin/spot-aliens.py* /usr/bin/spot-dup-accounts.sh +/lib/systemd/system/plc.service %files config %defattr(-,root,root,-) @@ -252,6 +250,43 @@ fi %changelog +* Mon Apr 16 2012 Thierry Parmentelat - myplc-5.1-1 +- use nodeimage package instead of deprecated bootstrapfs +- has systemd-friendly startup script +- plc_reload moved to functions/ - no more service plc reload +- no svn keywords anymore + +* Mon Sep 26 2011 Thierry Parmentelat - myplc-5.0-19 +- new maintenance/monitoring script spot-aliens to look for glitches in refreshpeer+sfa + +* Tue Jun 07 2011 Thierry Parmentelat - myplc-5.0-18 +- new settings for myslice (comon&tophat) and monitor (db) +- removed mentions of chroot in description +- can redo myplc-docs on broken f12-latex +- set short_open_tag in php.ini +- fixes in gen-sites-xml (is that still used ?) +- partial-repo.sh has moved to 'build' where it more belongs +- tweaks in convenience tool 'mtail' + +* Tue Mar 22 2011 Thierry Parmentelat - myplc-5.0-17 +- fixed changelog, no change from 5.0-16 + +* Mon Mar 21 2011 Thierry Parmentelat - myplc-5.0-16 +- requires ed for the plc.d/packages step +- sirius initscript to handle stop and restart + +* Fri Feb 04 2011 Thierry Parmentelat - myplc-5.0-15 +- ignore steps in db-config.d if they have a '.' or '~' in their name + +* Wed Jan 26 2011 Thierry Parmentelat - myplc-5.0-14 +- can redo myplc-docs without the doc for monitor + +* Mon Jan 24 2011 Thierry Parmentelat - myplc-5.0-13 +- no semantic change - just fixed specfile for git URL + +* Wed Dec 01 2010 Thierry Parmentelat - myplc-5.0-12 +- needed for plcapi-5.0-19, i.e. tag permissions based on roles + * Mon Oct 04 2010 Baris Metin - myplc-5.0-11 - add missing files to rpm package