X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=c5451a6479a46e6e19884e120a4ec74c3d923eb3;hb=2d3f9322b40cfae7f15b31958854624aba321de2;hp=54982f414a2a30a23ca9bb586041d61189622e70;hpb=7f7e017ebef6e4a977ea1e0d9afd7936eab281ab;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 54982f4..c5451a6 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,10 +1,6 @@ -# -# $Id$ -%define url $URL$ - %define name myplc %define version 5.0 -%define taglevel 6 +%define taglevel 17 %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} @@ -54,6 +50,7 @@ Requires: vim-minimal Requires: findutils Requires: xmlsec1 Requires: xmlsec1-openssl +Requires: ed %if "%{distro}" == "Fedora" && %{distrorelease} >= 10 Requires: cronie %else @@ -75,14 +72,13 @@ 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 @@ -228,8 +224,21 @@ fi /etc/planetlab /etc/plc_sliceinitscripts /etc/support-scripts -/usr/bin/ /usr/share/myplc/bashrc +# keep a detailed list, to avoid duplicate of plc-config, +# that belongs to the myplc-config rpm +/usr/bin/plc-config-tty +/usr/bin/db-config +/usr/bin/dns-config +/usr/bin/refresh-peer.py* +/usr/bin/mtail.py* +/usr/bin/plc-map.py* +/usr/bin/plc-kml.py* +/usr/bin/clean-empty-dirs.py* +/usr/bin/plc-check-ssl-peering.py* +/usr/bin/plc-orphan-accounts.py* +/usr/bin/spot-aliens.py* +/usr/bin/spot-dup-accounts.sh %files config %defattr(-,root,root,-) @@ -238,6 +247,42 @@ fi %changelog +* 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 + +* Mon Oct 04 2010 Thierry Parmentelat - myplc-5.0-10 +- mtail.py -s for SFA +- spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa + +* Thu Jul 15 2010 Thierry Parmentelat - myplc-5.0-9 +- avoid duplication of the plc-config binary in both myplc and myplc-config rpms + +* Mon Jul 12 2010 Thierry Parmentelat - myplc-5.0-8 +- plc-config-tty now has a validator on booleans +- e.g. entering 'True' now is rejected rather than silently recording 'false' + +* Tue Jul 06 2010 Baris Metin - MyPLC-5.0-7 +- disable mod_wsgi + * Mon Jul 05 2010 Baris Metin - MyPLC-5.0-6 - module name changes - start wsgi support