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

Comparing COMP/CMSDIST/dbs-client.spec (file contents):
Revision 1.47 by dlange, Wed Apr 9 00:15:48 2008 UTC vs.
Revision 1.139 by afaq, Mon Sep 27 14:04:03 2010 UTC

# Line 1 | Line 1
1 < ### RPM cms dbs-client DBS_1_1_2_pre1
1 > ### RPM cms dbs-client DBS_2_1_4
2   ## INITENV +PATH PYTHONPATH %i/lib/
3 < #
4 < #
3 > ## INITENV +PATH PYTHONPATH %i/bin/
4 > ## INITENV +PATH PYTHONPATH %{i}/lib/
5 > ## INITENV +PATH PYTHONPATH %{i}/lib/DBSAPI/
6 > ## INITENV SET DBS_CLIENT_CONFIG %{i}/lib/DBSAPI/dbs.config
7 > ## INITENV SET DBSCMD_HOME %{i}/lib/DBSAPI
8 >
9   %define cvstag %{realversion}
10   %define cvsserver cvs://:pserver:anonymous@cmscvs.cern.ch:2401/cvs_server/repositories/CMSSW?passwd=AA_:yZZ3e
11   Source: %cvsserver&strategy=checkout&module=DBS/Clients/Python&nocache=true&export=DBS&tag=-r%{cvstag}&output=/dbs-client.tar.gz
12 < Requires: python openssl py2-zsi
12 > Requires: python openssl py2-zsi py2-pyxml
13  
14  
15   %prep
# Line 18 | Line 22 | mkdir -p %{i}/bin
22   mkdir -p %{i}/lib
23   mkdir -p %{i}/etc/profile.d
24   cp -r Clients/Python/* %{i}/lib/
25 + mv %{i}/lib/bin/* %{i}/bin/
26 +
27 + #cp -r Clients/Python/DBSAPI/dbsCommandLine.py %{i}/bin/dbs
28 + #chmod a+x %{i}/bin/dbs
29  
30   (echo "#!/bin/sh"; \
31   echo "source $PYTHON_ROOT/etc/profile.d/init.sh"; \
32   echo "source $OPENSSL_ROOT/etc/profile.d/init.sh"; \
33   echo "source $PY2_ZSI_ROOT/etc/profile.d/init.sh"; \
34 + echo "source $PY2_PYXML_ROOT/etc/profile.d/init.sh"; \
35   ) > %{i}/etc/profile.d/dependencies-setup.sh
36  
37   (echo "#!/bin/tcsh"; \
38   echo "source $PYTHON_ROOT/etc/profile.d/init.csh"; \
39   echo "source $OPENSSL_ROOT/etc/profile.d/init.csh"; \
40   echo "source $PY2_ZSI_ROOT/etc/profile.d/init.csh"; \
41 + echo "source $PY2_PYXML_ROOT/etc/profile.d/init.csh"; \
42   ) > %{i}/etc/profile.d/dependencies-setup.csh
43  
44   # SCRAM ToolBox toolfile
45   mkdir -p %i/etc/scram.d
46 < cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
47 < <doc type=BuildSystem::ToolDoc version=1.0>
48 < <Tool name=dbs-client version=%v>
49 < <client>
50 < <Environment name=DBS_CLIENT_BASE default="%i"></Environment>
51 < </client>
52 < <Runtime name=PATH value="$DBS_CLIENT_BASE/bin" type=path>
53 < </Tool>
46 > cat << \EOF_TOOLFILE >%i/etc/scram.d/%n.xml
47 >  <tool name="dbs-client" version="%v">
48 >    <client>
49 >      <environment name="DBS_CLIENT_BASE" default="%i"/>
50 >    </client>
51 >    <runtime name="PATH" value="$DBS_CLIENT_BASE/bin" type="path"/>
52 >    <runtime name="PYTHONPATH" value="$DBS_CLIENT_BASE/lib" type="path"/>
53 >    <runtime name="PYTHONPATH" value="$DBS_CLIENT_BASE/lib/DBSAPI" type="path"/>
54 >    <runtime name="DBS_CLIENT_CONFIG" value="$DBS_CLIENT_BASE/lib/DBSAPI/dbs.config"/>
55 >    <runtime name="DBSCMD_HOME" value="$DBS_CLIENT_BASE/lib/DBSAPI"/>
56 >  </tool>
57   EOF_TOOLFILE
58  
59   %post
60   %{relocateConfig}etc/profile.d/dependencies-setup.sh
61   %{relocateConfig}etc/profile.d/dependencies-setup.csh
62 < %{relocateConfig}etc/scram.d/%n
62 > %{relocateConfig}etc/scram.d/%n.xml
63 >
64 > # hack init.csh to get around bug in current version of PKGTOOLS
65 > # will have no effect with the bug fixed verion
66 > perl -p -i -e 's|\. |source |' $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines