X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-native.spec;h=1048bc61ffe95bda88858fd13d2e8617edc9cf82;hb=refs%2Fheads%2F4.2;hp=fbad618c34ffd5f4bcc42a683e2fff9a274bf2b2;hpb=57329719de4f55fea1752d6d289adc466e510b98;p=myplc.git diff --git a/myplc-native.spec b/myplc-native.spec index fbad618..1048bc6 100644 --- a/myplc-native.spec +++ b/myplc-native.spec @@ -5,7 +5,7 @@ %define name myplc-native %define version 4.2 -%define taglevel 3 +%define taglevel 20 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -17,6 +17,7 @@ License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central @@ -58,18 +59,25 @@ 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 +Requires: bootstrapfs-%{pldistro}-%{_arch} +Requires: myplc-docs + +# 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} @@ -88,7 +96,7 @@ system. %build pushd MyPLC rm -rf $RPM_BUILD_ROOT -./build-native.sh $RPM_BUILD_ROOT +./build-native.sh %{pldistro} $RPM_BUILD_ROOT popd %install @@ -105,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 @@ -180,10 +188,13 @@ fi %files %defattr(-,root,root,-) # Host startup script and configuration file +/etc/myplc-release /etc/init.d/plc /etc/plc.d /etc/planetlab -/var/www/html/install-rpms/planetlab +/etc/plc_sliceinitscripts/sirius +/etc/support-scripts/gen_aliases.py* +/etc/support-scripts/renew_reminder.py* /usr/bin/plc-config /usr/bin/plc-config-tty /usr/bin/db-config @@ -195,6 +206,89 @@ fi /usr/share/myplc %changelog +* Fri Apr 10 2009 Faiyaz Ahmed - MyPLC-4.2-20 +- * Skip SSL generation for services that aren't enabled +- * added --full flag to crond for vacuumdb + +* Tue Nov 18 2008 Daniel Hokka Zakrisson - MyPLC-4.2-19 +- Add common slice attributes. +- Clarified 'failed to authenticate' message. +- Make db-config extensible. + +* Wed Sep 03 2008 Thierry Parmentelat - MyPLC-4.2-18 +- onelab distro requires the dummynet_image package with myplc-native +- (onelab distro does not build chroot-myplc anymore) + +* Fri Aug 01 2008 Faiyaz Ahmed - MyPLC-4.2-17 +- Remove iptables conf_file. Now in iptables module. +- Arch specific download directory now in /data for chrooted myplc +- Vim now a dependency in myplc. :-) + +* Fri Jul 04 2008 Thierry Parmentelat - MyPLC-4.2-16 +- yum config on nodes improved -- see https://svn.planet-lab.org/ticket/342 +- also does not create any repo under /var/www/html/install-rpms, to prevent conflicts with noderepo + +* 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