X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plewww.spec;h=dc0dd4c6cc81ebb5222cbb3079fd42e87d80a587;hb=40f8bf1514ef4194dab680f60814ed7642bb5ae1;hp=bda2388f01edc9c2b28d4474f9b3ac25c8b10dee;hpb=cc97ecdde8d157ff6d673bff2fc8d71d3bad5736;p=plewww.git

diff --git a/plewww.spec b/plewww.spec
index bda2388..dc0dd4c 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 15
+%define taglevel 18
 
 # 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 <support@one-lab.org>
@@ -57,8 +58,8 @@ 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
@@ -71,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 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
@@ -123,6 +124,20 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/plekit
 
 %changelog
+* Sun Jun 07 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - PLEWWW-4.3-15
 - plekittable knows how to turn off sort-on-load, and the admin users pages do
 - + various cosmetic fixes