X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plewww.spec;h=518e559a91c79a4ef4ad719119ba21497ebd5983;hb=22c118d7b9752ec5adfa59dcc110b93598e5cca3;hp=ab14682dbf5e77ba1e366194749dc9431097dc43;hpb=2c19ada076f651256d141989c9aed1c0214a6b09;p=plewww.git diff --git a/plewww.spec b/plewww.spec index ab14682..518e559 100644 --- a/plewww.spec +++ b/plewww.spec @@ -5,7 +5,7 @@ # what the myplc rpm requires %define name plewww %define version 4.3 -%define taglevel 0 +%define taglevel 45 # no need to mention pldistro as this module differs in both distros #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -20,6 +20,7 @@ Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch +BuildRequires: python Vendor: OneLab Packager: OneLab @@ -57,20 +58,21 @@ This subset of the plewww package has general purpose features for the benefit o %setup -q %build -echo "There is no build stage for this component" -echo "All files just need to be installed as is from the codebase" +echo "Compressing javascript files" +make compress %install rm -rf $RPM_BUILD_ROOT # -# plcwww +# plewww +# xxx : uninstall should undo this # echo "* PLEWWW: Installing web pages" mkdir -p $RPM_BUILD_ROOT/var/www/html # exclude codebase just in case -rsync -a --exclude Makefile --exclude httpd --exclude \*.spec --exclude .svn ./ $RPM_BUILD_ROOT/var/www/html/ +rsync -a --exclude jsmin.py --exclude Makefile --exclude httpd --exclude \*.spec --exclude .svn ./ $RPM_BUILD_ROOT/var/www/html/ echo "* PLEWWW: Installing conf files for httpd" mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d @@ -101,10 +103,12 @@ fi popd # hack the welcome page for MyPLC pushd /var/www/html/modules -if [ ! -f node.module.drupal ] ; then - cp node.module node.module.drupal - [ -f /var/www/html/drupal-hacks/node.module ] && cp -f /var/www/html/drupal-hacks/node.module /var/www/html/modules/node.module -fi +for module in user node; do + # backup only once + [ -f ${module}.module.drupal ] || cp ${module}.module ${module}.module.drupal + # always update so a change in our file can make through + cp -f /var/www/html/drupal-hacks/${module}.module /var/www/html/modules/${module}.module +done popd %clean @@ -122,6 +126,175 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/plekit %changelog +* Tue Jun 15 2010 Baris Metin - PLEWWW-4.3-45 +- encode strings properly in forms. + +* Wed Apr 28 2010 S.Çağlar Onur - PLEWWW-4.3-44 +- Use readfile() function to reduce the memory footprint + +* Fri Apr 02 2010 Thierry Parmentelat - PLEWWW-4.3-43 +- removed all deprecated functions for PHP-5.3 on fedora 12 + +* Tue Mar 16 2010 Talip Baris Metin - PLEWWW-4.3-42 +- * exclude DNS from subnet checking +- * redirect pi's and techs to register wizard. only display 'Insuffieient privs' error to users' +- * allow longer abbreviated names +- * don't let empty strings kill the server (postgresql and apache) + +* Sat Jan 09 2010 Thierry Parmentelat - PLEWWW-4.3-41 +- disable drupal user registration (hard: patching the user module) + +* Wed Dec 16 2009 Baris Metin - PLEWWW-4.3-40 +- * show error messages for update interface +- * 'Add Node' is admin only +- * add site selector for 'Add Node' + +* Thu Nov 26 2009 Thierry Parmentelat - PLEWWW-4.3-39 +- new add-interface page : now has a checkbox for non-primary interfaces to chose between virtual or physical +- this affects the settings of ifname and alias that were formerly set unconditionally +- review the interface-checking javascript code +- changed the interface to plekitform, method is now optional and part of an options hash + +* Tue Nov 17 2009 Thierry Parmentelat - PLEWWW-4.3-38 +- can't use php objects for showing node status, this is too slow +- fix interface add page + +* Mon Nov 16 2009 Thierry Parmentelat - PLEWWW-4.3-37 +- consistency in the way nodes status is displayed in the node and slice areas +- extra tags columns show up on the nodes page as well, tweaked in the process +- roles management in person page fixed + +* Sun Nov 15 2009 Thierry Parmentelat - PLEWWW-4.3-36 +- displaying node tags in the nodes page as well +- table headers now can have a 'title' that shows up when hovering on the column header + +* Sat Nov 14 2009 Thierry Parmentelat - PLEWWW-4.3-35 +- bugfix for the custom sortAlphaNumeric{Bottom,Top} sortable types + +* Fri Nov 13 2009 Thierry Parmentelat - PLEWWW-4.3-34 +- extensible set of columns in the nodes area of the (my)slice page +- nodegroups can be added/deleted/updated +- tags management improved marginally + +* Tue Oct 20 2009 Thierry Parmentelat - PLEWWW-4.3-33 +- fix pending sites page - was getting fooled by ext_consortium_id=None + +* Tue Oct 20 2009 Thierry Parmentelat - PLEWWW-4.3-32 +- resetting tag as something went wrong when setting 31 + +* Wed Oct 07 2009 Thierry Parmentelat - PLEWWW-4.3-30 +- nicer look for slice creation, (public) sites +- users show with all their sites in the persons page + +* Fri Sep 18 2009 Thierry Parmentelat - PLEWWW-4.3-29 +- reviewed registration pages for persons and sites + +* Fri Sep 11 2009 Thierry Parmentelat - PLEWWW-4.3-28 +- increase memory limit in the nodes page + +* Thu Sep 10 2009 Thierry Parmentelat - PLEWWW-4.3-27 +- fixes one typo + +* Mon Sep 07 2009 Thierry Parmentelat - PLEWWW-4.3-26 +- minor/cosmetic + +* Mon Aug 10 2009 Stephen Soltesz - PLEWWW-4.3-25 +- Add default Interface tags to extra interfaces. +- Add clearer 'Add New PCU' link on node page. +- Disable user registration for tech and PI roles. + +* Thu Jul 02 2009 Thierry Parmentelat - PLEWWW-4.3-24 +- new 'controller' instantiation state available in add slice page + +* Thu Jul 02 2009 Baris Metin - PLEWWW-4.3-23 +- exclude datepicler.js from jsmin +- table sort function for Last Contact columns +- drop options for generic boot images + +* Wed Jul 01 2009 Thierry Parmentelat - PLEWWW-4.3-22 +- displays editable mac address for interfaces +- properly sorts bandwidths +- new 'controller' slice instantiation method +- bugfix, division by zero when displaying a just-changed node + +* Tue Jun 16 2009 Thierry Parmentelat - PLEWWW-4.3-21 +- bugfix with linetabs + +* Tue Jun 16 2009 Thierry Parmentelat - PLEWWW-4.3-20 +- fix add interface from the node page + +* Mon Jun 15 2009 Stephen Soltesz - PLEWWW-4.3-19 +- only add users that are enabled and not yet a member of the slice +- fix to plc_peers +- my sites, my nodes, my persons improvements for users with multiple sites +- adds a script to minimize the java script files. + +* Sun Jun 07 2009 Thierry Parmentelat - PLEWWW-4.3-18 +- planetlab module to show 'All My Sites Nodes' link rather than 'My Site Nodes' if several sites + +* Sun Jun 07 2009 Thierry Parmentelat - PLEWWW-4.3-17 +- first draft for pcu-handling features +- lighter contrat for PLE/PLC toggles +- as many 'my site'-like links as the user has sites + +* Wed Jun 03 2009 Thierry Parmentelat - PLEWWW-4.3-16 +- fix for whitelisted nodes +- now links to the node register wizard +- can enable sites +- various other minor fixes, like broken planetlab.module for techs, and login link + +* Sat May 30 2009 Thierry Parmentelat - PLEWWW-4.3-15 +- plekittable knows how to turn off sort-on-load, and the admin users pages do +- + various cosmetic fixes + +* Tue May 26 2009 Thierry Parmentelat - PLEWWW-4.3-14 +- a few minor improvements pushed on PLE + +* Fri May 15 2009 Thierry Parmentelat - PLEWWW-4.3-13 +- fix for sites that were displayed as not public +- improvements to the python interface to sortable tables for monitor + +* Fri May 15 2009 Thierry Parmentelat - PLEWWW-4.3-12 +- various improvements + +* Wed May 06 2009 Thierry Parmentelat - PLEWWW-4.3-11 +- sliver page now correctly shows sliver tags +- support for download-node-usb-partition and various other improvements + +* Tue Apr 28 2009 Thierry Parmentelat - PLEWWW-4.3-10 +- a few tweaks and typos fixed on PLE + +* Tue Apr 21 2009 Thierry Parmentelat - PLEWWW-4.3-9 +- slice_add & node_download dialogs use plekit +- slice_add can add people in the slice +- various improvements after rollout on PLE + +* Fri Apr 17 2009 Thierry Parmentelat - PLEWWW-4.3-8 +- cosmetic fixes to be in 4.3-rc2 +- also a first (unpackaged) draft of the plekit table in python + +* Tue Apr 14 2009 Thierry Parmentelat - PLEWWW-4.3-7 +- search in tables more robust + +* Thu Apr 09 2009 Baris Metin - PLEWWW-4.3-6 +- performance improvements + +* Thu Apr 09 2009 Thierry Parmentelat - PLEWWW-4.3-5 +- detect expired session and redirect to the login page + +* Thu Apr 09 2009 Thierry Parmentelat - PLEWWW-4.3-4 +- improve browser health - was using too many cycles + +* Tue Apr 07 2009 Thierry Parmentelat - PLEWWW-4.3-3 +- more consistency between views, and cosmetic changes + +* Mon Mar 30 2009 Thierry Parmentelat - PLEWWW-4.3-2 +- area for managing slice tags + +* Tue Mar 24 2009 Thierry Parmentelat - PLEWWW-4.3-1 +- first checkpoint tag for PLEWWW +- mostly functionally complete, probably a lot of tweaks still needed + * Fri Apr 25 2008 Thierry Parmentelat - PLCWWW-onelab.4.2-11 - everyone is welcome to add nodes