git://git.onelab.eu
/
nodeconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For some reason, module-tag -b 4.2 updated the 5.0 branch
[nodeconfig.git]
/
nodeconfig.spec
diff --git
a/nodeconfig.spec
b/nodeconfig.spec
index
159a959
..
05bd27f
100644
(file)
--- a/
nodeconfig.spec
+++ b/
nodeconfig.spec
@@
-4,8
+4,8
@@
%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
%define name nodeconfig
%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
%define name nodeconfig
-%define version
4.2
-%define taglevel
4
+%define version
5.0
+%define taglevel
0
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-26,7
+26,7
@@
URL: %(echo %{url} | cut -d ' ' -f 2)
# We use set everywhere
Requires: php >= 5.0
# We use set everywhere
Requires: php >= 5.0
-Requires: PLCAPI >=
4
.0
+Requires: PLCAPI >=
5
.0
%description
%description
@@
-50,9
+50,8
@@
echo "* nodeconfig: Installing PlanetLabConf pages"
for dir in boot PlanetLabConf PLCAPI ; do
mkdir -p $RPM_BUILD_ROOT/var/www/html/$dir
for dir in boot PlanetLabConf PLCAPI ; do
mkdir -p $RPM_BUILD_ROOT/var/www/html/$dir
+ rsync -a --exclude .svn ./$dir/ $RPM_BUILD_ROOT/var/www/html/$dir/
done
done
-# let's be conservative and exclude codebase files, though there should not be any
-rsync -a --exclude \*.spec --exclude .svn --exclude CVS ./ $RPM_BUILD_ROOT/var/www/html/
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-75,3
+74,5
@@
rm -rf $RPM_BUILD_ROOT
- integrated /var/www/html/{boot,PLCAPI} from PLCWWW
- former content has moved down into PlanetLabConf
- integrated /var/www/html/{boot,PLCAPI} from PLCWWW
- former content has moved down into PlanetLabConf
+
+%define module_current_branch 4.2