X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=665599f0b6c8d672afcfc8e6a66e4cfcd802961a;hb=bd051c829da0055a5d7396f96738beefe6b1be70;hp=455249cf28ce97389372685c3db556b87df6ebf3;hpb=56ad918e5dcc25c1ab6b50aaf8a50eb70004fede;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 455249c..665599f 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,10 +1,6 @@ -# -# $Id$ -%define url $URL$ - %define name myplc %define version 5.0 -%define taglevel 0 +%define taglevel 13 %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} @@ -61,16 +57,13 @@ Requires: vixie-cron %endif # planetlab stuff Requires: bootmanager -# make sure to remove 2-fold nodefamily stuff -Conflicts: bootcd-%{pldistro}-%{_arch} Requires: bootcd-%{nodefamily} Requires: bootcd-initscripts Requires: PLCWWW Requires: www-register-wizard Requires: nodeconfig +Requires: nodeyum Requires: PLCAPI -# make sure to remove 2-fold nodefamily stuff -Conflicts: bootstrapfs-%{pldistro}-%{_arch} Requires: bootstrapfs-%{nodefamily} Requires: myplc-docs Requires: myplc-release @@ -231,8 +224,22 @@ 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/partial-repo.sh +/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,-) @@ -241,6 +248,56 @@ fi %changelog +* 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 + +* Tue Jun 22 2010 Thierry Parmentelat - MyPLC-5.0-5 +- new setting PLC_RESERVATION_GRANULARITY + +* Wed May 12 2010 Talip Baris Metin - MyPLC-5.0-4 +- * partial-repo.sh script +- * preserve key along with certificates + +* Fri Apr 02 2010 Thierry Parmentelat - MyPLC-5.0-3 +- set date.timezone to GMT if not set in php.ini for php-5.3 / fedora12 + +* Fri Mar 12 2010 Thierry Parmentelat - MyPLC-5.0-2 +- legacy scripts gen-sites-xml & gen-static-content back in (sigh) +- new OMF category in the config +- create the drl system slice + +* Fri Jan 29 2010 Thierry Parmentelat - MyPLC-5.0-1 +- first working version of 5.0: +- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to +- nodefamily is 3-fold with pldistro-fcdistro-arch +- new PLC_FLAVOUR config category +- reviewed module layout +- cleaned up old chroot-related build stuff (does not need the build module when building anymore) + * Sat Jan 09 2010 Thierry Parmentelat - MyPLC-4.3-37 - support for fedora 12 - new package myplc-config for use by sfa