tkonlinesw: bump to 4.0.0-1

Signed-off-by: David Abdurachmanov <[email protected]>
cms-sw · Feb 28, 2016 · c5cdd88 · c5cdd88
1 parent e3f2a2b
commit c5cdd88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 55 deletions.
diff --git a/tkonlinesw-2.7.0-fix-gcc46.patch b/tkonlinesw-2.7.0-fix-gcc46.patch
diff --git a/tkonlinesw-toolfile.spec b/tkonlinesw-toolfile.spec
@@ -18,6 +18,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlinesw.xml
     <environment name="INCLUDE" value="$TKONLINESW_BASE/include"/>
   </client>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
+  <flags CXXFLAGS="-DCMS_TK_64BITS"/>
   <use name="root_cxxdefaults"/>
   <use name="xerces-c"/>
 </tool>

diff --git a/tkonlinesw.spec b/tkonlinesw.spec
@@ -1,10 +1,9 @@
-### RPM external tkonlinesw 2.7.0
+### RPM external tkonlinesw 4.0.0-1
 
 %define projectname trackerDAQ
-%define releasename %{projectname}-%{realversion}
-Source0: http://cms-trackerdaq-service.web.cern.ch/cms-trackerdaq-service/download/sources/trackerDAQ-2.7.0-10.tgz
+%define releasename %{projectname}-4.0-tkonline
+Source0: http://cms-trackerdaq-service.web.cern.ch/cms-trackerdaq-service/download/sources/trackerDAQ-%{realversion}.tgz
 Patch0: tkonlinesw-2.7.0-macosx
-Patch1: tkonlinesw-2.7.0-fix-gcc46
 
 # NOTE: given how broken the standard build system is
 #       on macosx, it's not worth fixing it.
@@ -20,6 +19,7 @@ Requires: oracle
 Requires: xerces-c
 Requires: gmake
 Requires: systemtools
+Requires: root
 
 %prep
 %setup -q -n %releasename
@@ -28,7 +28,6 @@ case %cmsos in
 %patch0 -p1
   ;;
 esac
-%patch1 -p1
 # Clean up some mysterious old build within the sources that screws
 # up the install by copying in an old libFed9UUtils.so 
 # (this is really needed) 
@@ -38,8 +37,6 @@ perl -p -i -e "s|-Werror||" FecSoftwareV3_0/generic/Makefile
 
 
 %build
-echo "pwd: $PWD"
-
 ###############################################################################
 # Tracker Specific Definitions for running, should just be this ...
 ################################################################################
@@ -69,7 +66,6 @@ export ENV_CMS_TK_LASTGBOARD=%{_builddir}/%releasename/LAS
 # We use an empty directory because the path neeeds to exist.
 mkdir -p %i/dummy/Linux/lib
 export ENV_CMS_TK_HAL_ROOT=%{i}/dummy/Linux
-export ROOTSYS=%{i}/dummy/Linux
 export ENV_CMS_TK_CAEN_ROOT=%{i}/dummy/Linux
 export ENV_CMS_TK_SBS_ROOT=%{i}/dummy/Linux
 export ENV_CMS_TK_TTC_ROOT=%{i}/dummy/Linux
@@ -143,6 +139,6 @@ esac
 case %cmsos in
   slc*)
     # Option --prefix in configure is not working yet, using tar:
-    tar -c -C  %{_builddir}/%{releasename}/opt/%{projectname} --exclude "libcppunit.so" include lib | tar -x -C %{i}
+    tar -c -C  %{_builddir}/%{releasename}/opt/%{projectname} include lib | tar -x -C %{i}
   ;;
 esac