X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-native.spec;h=0f27e5bf403bef48bf36636ff54ab495e744ea96;hb=401af0c77ac1495e7e08616406dd6c3ee62f637f;hp=1c06b05bea9af1329f6942e9f1d744294efe1b98;hpb=554307bc1c43f15d448a3c49310b684ba610c4a9;p=myplc.git diff --git a/myplc-native.spec b/myplc-native.spec index 1c06b05..0f27e5b 100644 --- a/myplc-native.spec +++ b/myplc-native.spec @@ -1,16 +1,28 @@ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 4.0 -URL: http://cvs.planet-lab.org/cvs/myplc +# +# $Id$ +# +%define url $URL$ + +%define name myplc-native +%define version 5.0 +%define taglevel 1 + +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} Summary: PlanetLab Central (PLC) Portable Installation -Name: myplc-native -Version: 0.5 -Release: 4%{?pldistro:.%{pldistro}}%{?date:.%{date}} +Name: %{name} +Version: %{version} +Release: %{release} License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) Requires: bzip2 Requires: sendmail-cf @@ -24,6 +36,7 @@ Requires: expect Requires: php-pgsql Requires: curl Requires: python-pycurl +Requires: python-psycopg2 Requires: httpd Requires: rsync Requires: mod_python @@ -34,8 +47,6 @@ Requires: SOAPpy Requires: vixie-cron Requires: yum Requires: php-gd -Requires: PLCWWW -Requires: PLCAPI Requires: PyXML Requires: sendmail Requires: python >= 2.4 @@ -48,13 +59,26 @@ Requires: php Requires: xmlsec1-openssl Requires: postgresql Requires: openssh -Requires: cvs -Requires: dev -Requires: bootcd +Requires: bootcd-%{pldistro}-%{_arch} Requires: dnsmasq Requires: diffutils Requires: gzip +Requires: vim-minimal Requires: findutils +# planetlab stuff +Requires: PLCWWW +Requires: nodeconfig +Requires: PLCAPI +Requires: bootstrapfs-%{pldistro}-%{_arch} +Requires: myplc-docs +Requires: myplc-release + +# argh - ugly - we might wish to use something from build/config.%{pldistro} instead +%if "%{pldistro}" == "onelab" +Requires: dummynet_image +%endif + +Provides: myplc = %version-%release %define debug_package %{nil} @@ -71,13 +95,13 @@ system. %setup -q %build + +%install pushd MyPLC rm -rf $RPM_BUILD_ROOT -./build-native.sh $RPM_BUILD_ROOT +./build-native.sh %{pldistro} $RPM_BUILD_ROOT popd -%install - %clean rm -rf $RPM_BUILD_ROOT @@ -89,7 +113,7 @@ if [ -n "$SUDO_USER" ] ; then # /usr/bin/sudo get created with non-readable permissions. find . -not -perm +0600 -exec chmod u+rw {} \; # Allow user to delete the built RPM(s) - chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} + [ -d %{_rpmdir}/noarch ] && chown -h -R $SUDO_USER %{_rpmdir}/noarch fi %pre @@ -132,6 +156,10 @@ if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig --add plc /sbin/chkconfig plc on fi +pushd /usr/share/myplc &> /dev/null +python plc_config.py build +python plc_config.py install +popd &> /dev/null %triggerpostun -- %{name} # 0 = erase, 1 = upgrade @@ -161,19 +189,97 @@ fi %defattr(-,root,root,-) # Host startup script and configuration file /etc/init.d/plc +/etc/plc.d +/etc/planetlab +/etc/plc_sliceinitscripts/sirius +/etc/support-scripts/gen_aliases.py* +/etc/support-scripts/renew_reminder.py* +/etc/support-scripts/renew_reminder_logrotate /usr/bin/plc-config /usr/bin/plc-config-tty /usr/bin/db-config /usr/bin/dns-config -/usr/bin/gen-sites-xml.py* -/usr/bin/gen-slices-xml-05.py* -/usr/bin/gen-static-content.py* -/etc/plc.d -/etc/planetlab -/var/www/html/install-rpms/planetlab +/usr/bin/plc-map.py* +/usr/bin/plc-kml.py* +/usr/bin/refresh-peer.py* +/usr/bin/clean-empty-dirs.py* +/usr/bin/mtail.py* +/usr/bin/check-ssl-peering.py* +/usr/share/myplc %changelog +* Wed Sep 10 2008 Thierry Parmentelat - MyPLC-5.0-1 +- First iteration of new data model +- Bunch of various fixes + +* Tue May 20 2008 Faiyaz Ahmed - MyPLC-4.2-15 +- Removed proper ops from planetflow slice. + +* Wed May 14 2008 Thierry Parmentelat - MyPLC-4.2-14 +- myplc-native requires myplc-docs +- fixed doc build by locating locally installed DTDs at build-time + +* Sun May 11 2008 Thierry Parmentelat - MyPLC-4.2-13 +- turn myplc-docs off for now + +* Sat May 10 2008 Thierry Parmentelat - MyPLC-4.2-12 +- figures in doc package + +* Fri May 09 2008 Thierry Parmentelat - MyPLC-4.2-11 +- no more doc packaged outside of myplc-docs - doc/ cleaned up +- chroot packaging does not have docs anymore +- 'cvs' and 'dev' not required from myplc-native anymore +- cosmetic change in kml output + +* Thu May 08 2008 Thierry Parmentelat - MyPLC-4.2-10 +- defaults for *_IP conf vars now void, expect more accurate /etc/hosts +- gethostbyname uses python rather than perl (hope this shrinks deps) +- doc: reviewed myplc doc - deprecated everything related to myplc-devel +- doc: packaging doc in myplc-native (myplc&PLCAPI) & removed target files from svn +- make sync now works towards vserver-based myplc only + +* Mon May 05 2008 Stephen Soltesz - MyPLC-4.2-9 +- +- added vsys 'pfmount' script to the default netflow slice attributes. +- + +* Thu Apr 24 2008 Thierry Parmentelat - MyPLC-4.2-8 +- plc.d/bootcd step altered for handling legacy bootcd smooth migration +- to new bootcd packaging + +* Wed Apr 23 2008 Thierry Parmentelat - MyPLC-4.2-7 +- changes needed for bootcd 4.2 : new, possible multiple, installation locations, and new rpm name + +* Tue Apr 22 2008 Thierry Parmentelat - MyPLC-4.2-6 +- packaging of mplc-release in myplc-native +- sudoers.php is new to PlanetLabConf (needs nodeconfig-4.2-4) +- resolv file in /etc/resolv.conf, not plc_resolv.conf +- improved sirius script +- remove the 'driver' node-network-setting that was unused, and new 'Multihome' category +- expires more properly set + +* Mon Apr 07 2008 Stephen Soltesz - MyPLC-4.2-4 MyPLC-4.2-5 +- + +* Wed Mar 26 2008 Thierry Parmentelat - MyPLC-4.2-3 MyPLC-4.2-4 +- renew_reminder script moved to support-scripts/ +- gen-aliases script added in support-scripts/ +- sirius initscript moved to plc_sliceinitscripts (formerly inlined in db-config) +- plc-map script : no javascript for googlemap anymore, see new plc-kml script instead +- nodefamily-aware (creates legacy symlink /var/www/html/install-rpms/planetlab) +- new native slice attributes 'capabilities', 'vsys' and 'codemux' +- new setting 'Mom list address' for sending emails to a separate destination +- starts rsyslogd/syslogd as appropriate +- expects nodeconfig package (former PlanetLabConf/ dir from PLCWWW) +- convenience generation of yum.conf in resulting image based on build/mirroring + +* Thu Feb 14 2008 Thierry Parmentelat - myplc-4.2-2 myplc-4.2-3 +- refresh-peer.py removed (duplicate with PLCAPI) +- plc.d/ scripts cleaned up +- sirius initscript updated +- slice auto renewal fixed + * Fri Aug 31 2007 Marc E. Fiuczynski - initial build. - +%define module_current_branch 4.2