X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=e98132f4e926060524073ac0ca257dbd963d51c8;hb=6059d6cb9767d3d3944a4992f6305bd67f9f8949;hp=fee586775e4c4edf7d8a9cf5cc0501690e96dd6b;hpb=ba5fb01a6de68899a30c34894514dca6320cacfb;p=myplc.git diff --git a/myplc.spec b/myplc.spec index fee5867..e98132f 100644 --- a/myplc.spec +++ b/myplc.spec @@ -5,16 +5,15 @@ %define name myplc %define version 4.3 -%define taglevel 33 +%define taglevel 47 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) -Summary: PlanetLab Central (PLC) Portable Installation Name: %{name} Version: %{version} Release: %{release} License: PlanetLab -Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -24,7 +23,14 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) + + +####################### myplc +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 @@ -36,7 +42,6 @@ Requires: php-pgsql Requires: curl Requires: rsync Requires: python-devel -Requires: vixie-cron Requires: yum Requires: PyXML Requires: createrepo @@ -51,6 +56,11 @@ Requires: vim-minimal Requires: findutils Requires: xmlsec1 Requires: xmlsec1-openssl +%if "%{distro}" == "Fedora" && %{distrorelease} >= 10 +Requires: cronie +%else +Requires: vixie-cron +%endif # planetlab stuff Requires: bootmanager Requires: bootcd-%{pldistro}-%{_arch} @@ -62,6 +72,7 @@ Requires: pcucontrol Requires: bootstrapfs-%{pldistro}-%{_arch} Requires: myplc-docs Requires: myplc-release +Requires: myplc-config # argh - ugly - we might wish to use something from build/config.%{pldistro} instead %if "%{pldistro}" == "onelab" @@ -79,12 +90,25 @@ 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. +####################### myplc-config + +%package config + +Summary: PlanetLab Central (PLC) configuration python module +Group: Applications/Systems +Requires: python + +%description config +This package provides the Python module to configure MyPLC. + + %prep %setup -q %build %install +[ -d MyPLC] || ln -s myplc MyPLC pushd MyPLC rm -rf $RPM_BUILD_ROOT ./build.sh %{pldistro} $RPM_BUILD_ROOT @@ -144,10 +168,6 @@ 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 @@ -183,7 +203,6 @@ fi /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 @@ -194,9 +213,63 @@ fi /usr/bin/mtail.py* /usr/bin/plc-check-ssl-peering.py* /usr/bin/plc-orphan-accounts.py* -/usr/share/myplc +/usr/share/myplc/bashrc + +%files config +%defattr(-,root,root,-) +/usr/bin/plc-config +%{python_sitearch}/plc_config.py* + %changelog +* Mon Mar 21 2011 S.Çağlar Onur - myplc-4.3-47 +- attempt to fix small glitches + +* Wed Mar 16 2011 S.Çağlar Onur - myplc-4.3-46 +- enable short_open_tag for backward compatibility + +* Tue Mar 15 2011 S.Çağlar Onur - myplc-4.3-45 +- Cherry-pick PHP5 timezone fix form master + +* Thu Feb 03 2011 S.Çağlar Onur - myplc-4.3-44 +- pick the greatest version as a kernel + +* Thu Jan 06 2011 S.Çağlar Onur - myplc-4.3-43 +- handle directory name changes for myplc-docs package as well + +* Thu Jan 06 2011 S.Çağlar Onur - myplc-4.3-42 +- handle directory name changes + +* Thu Nov 18 2010 Daniel Hokka Zakrisson - myplc-4.3-41 +- Use correct resolv.conf file. + +* Wed Nov 17 2010 Daniel Hokka Zakrisson - myplc-4.3-40 +- Make dnsmasq usable. + +* Wed Nov 17 2010 Daniel Hokka Zakrisson - myplc-4.3-39 +- Allow dnsmasq configuration to be extended. + +* Thu Jul 22 2010 Daniel Hokka Zakrisson - myplc-4.3-38 +- Add DRL slice. +- Generalize bootcd-kernel. + +* Sat Jan 09 2010 Thierry Parmentelat - MyPLC-4.3-37 +- support for fedora 12 +- new package myplc-config for use by sfa +- drupal user registration turned off + +* Thu Dec 31 2009 Marc Fiuczynski - MyPLC-4.3-36 +- - fix to make sure when API, BOOT, MONITOR are on the same +- machine as WWW that the SSL key,cert for WWW takes precedence. +- - Do proper setup for SSL CA certficate to be used as the server +- chain. + +* Wed Dec 23 2009 Marc Fiuczynski - MyPLC-4.3-35 +- - Change sysctl.conf source to be PlanetLabConfsysctl.con rather than the php script. + +* Tue Dec 22 2009 Baris Metin - MyPLC-4.3-34 +- depend on pcucontrol + * Fri Dec 18 2009 Baris Metin - MyPLC-4.3-33 - * validate input according to type in plc_config - * added the _genicw system slice