X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=myplc.spec;h=be3a43bbdd4e27d6399a47a4e938c8ea1a264397;hp=6b8e6490a314d2448efe8c6a9c4b9cfdd1326f07;hb=cbbfeee8979dcbf81d504d1ee6bd2dd083e2349f;hpb=f4a43ea12a059e92c0f921f3c001e6194d00eb24 diff --git a/myplc.spec b/myplc.spec index 6b8e649..be3a43b 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,10 +1,6 @@ -# -# $Id$ -%define url $URL$ - %define name myplc -%define version 5.0 -%define taglevel 9 +%define version 5.1 +%define taglevel 6 %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 @@ -112,11 +109,13 @@ install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/plc_config. echo "* Installing scripts in /usr/bin" mkdir -p ${RPM_BUILD_ROOT}/usr/bin rsync -av --exclude .svn bin/ ${RPM_BUILD_ROOT}/usr/bin/ +(cd $RPM_BUILD_ROOT/usr/bin; ln -s mtail.py mtail) 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,13 +234,18 @@ 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/mtail /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/check-hrns.py* +/usr/bin/check-vsys-defaults.py* +/usr/bin/spot-dup-accounts.sh +/lib/systemd/system/plc.service %files config %defattr(-,root,root,-) @@ -250,6 +254,69 @@ fi %changelog +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-6 +- bugfix in check-vsys-defaults.py + +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-5 +- define open_basedir in php.ini to stop confidentiality leak +- new utility slice_ssh_keys.py for showing sliver keys (OMF interop) +- new config setting PLC_VSYS_DEFAULTS for vsys tags granted to all +- new utilities check-hrns.py and check-vsys-defaults.py + +* Fri Aug 31 2012 Thierry Parmentelat - myplc-5.1-4 +- set TimeoutSec to 300 in plc.service +- remove ref to deprecated svn $URL$ in db-config usage + +* Mon Jul 09 2012 Thierry Parmentelat - myplc-5.1-3 +- expose mtail.py as simply mtail + +* Mon May 07 2012 Thierry Parmentelat - myplc-5.1-2 +- plc-kml.py now has support for nodegroups + +* 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 + +* 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