ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/dbs-web.spec
(Generate patch)

Comparing COMP/CMSDIST/dbs-web.spec (file contents):
Revision 1.128 by valya, Tue Sep 16 20:31:35 2008 UTC vs.
Revision 1.148 by valya, Wed Apr 15 14:29:29 2009 UTC

# Line 1 | Line 1
1 < ### RPM cms dbs-web V05_00_04
1 > ### RPM cms dbs-web V06_00_01
2   ## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
3   ## INITENV +PATH PYTHONPATH $ELEMENTTREE_ROOT/share/lib/python`echo $PYTHON_VERSION | cut -d. -f1,2`/site-packages
4   ## INITENV SET DDHOME $DBS_WEB_ROOT/lib/python`echo $PYTHON_VERSION | cut -d. -f1,2`/site-packages
# Line 8 | Line 8
8   %define cvstag %{realversion}
9   %define cvsserver cvs://:pserver:anonymous@cmscvs.cern.ch:2401/cvs_server/repositories/CMSSW?passwd=AA_:yZZ3e
10   Source: %cvsserver&strategy=checkout&module=DBS/Web/DataDiscovery&nocache=true&export=DBS&tag=-r%{cvstag}&output=/dbs-web.tar.gz
11 < Requires: python py2-sqlalchemy cherrypy py2-cheetah webtools yui elementtree dbs-client mysql py2-mysqldb sqlite py2-pysqlite py2-cx-oracle oracle-env py2-simplejson
11 > Requires: python py2-sqlalchemy cherrypy py2-cheetah webtools yui elementtree dbs-client mysql py2-mysqldb sqlite py2-pysqlite py2-cx-oracle oracle-env py2-simplejson py2-memcached
12  
13   %prep
14   %setup -n DBS/Web/DataDiscovery
# Line 26 | Line 26 | cp cmsweb_discovery dbs_discovery %{i}/e
26   chmod a+x %{i}/etc/init.d/*
27  
28   cd %i/lib/python`echo $PYTHON_VERSION | cut -d. -f1,2`/site-packages
29 + cp Templates/DBParam .
30 +
31   #ln -s $YUI_ROOT/build YUI
32  
33   # This will generate the correct dependencies-setup.sh/dependencies-setup.csh
# Line 72 | Line 74 | else
74      cat ${pdir}/DBSDD.conf | sed "s/# URL=/### _url_=/g" | sed "s/# PORT=/### _port_=/g" > ${pdir}/DBSDD.conf.tmp
75      mv ${pdir}/DBSDD.conf.tmp ${pdir}/DBSDD.conf
76   fi
77 < if [ -n "${WEBTOOLS_CONF}" ] && [ -f ${WEBTOOLS_CONF}/dbs/DBParam ]; then
78 <    rm -f ${pdir}/DBParam
79 <    ln -s ${WEBTOOLS_CONF}/dbs/DBParam ${pdir}/DBParam
80 < fi
81 < ###export TARGET_PROJECT=dbs-web
77 > #if [ -n "${WEBTOOLS_CONF}" ] && [ -f ${WEBTOOLS_CONF}/dbs/DBParam ]; then
78 > #    rm -f ${pdir}/DBParam
79 > #    ln -s ${WEBTOOLS_CONF}/dbs/DBParam ${pdir}/DBParam
80 > #fi
81 > cp ${pdir}/Templates/DBParam ${pdir}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines