[extrods] r270 committed - Add support for iRODS 3.0

[codesite...@google.com]

Revision: 270
Author: roger.downing
Date: Tue May 22 05:37:41 2012
Log: Add support for iRODS 3.0

http://code.google.com/p/extrods/source/detail?r=270

Added:
/trunk/RPM/tags/3.0
/trunk/RPM/tags/3.0/SOURCES/irods3.0-pthread.patch
Modified:
/trunk/RPM/tags/3.0/SPECS/irods.spec

=======================================
--- /dev/null
+++ /trunk/RPM/tags/3.0/SOURCES/irods3.0-pthread.patch Tue May 22 05:37:41
2012
@@ -0,0 +1,10 @@
+--- clients/icommands/Makefile.orig 2012-05-22 12:19:08.000000000 +0100
++++ clients/icommands/Makefile 2012-05-22 12:19:53.000000000 +0100
+@@ -152,6 +152,7 @@
+ CFLAGS = $(CFLAGS_OPTIONS) $(LIB_INCLUDES) $(SVR_INCLUDES)
$(MODULE_CFLAGS)
+
+ LDFLAGS += $(CL_LDADD) $(LIBRARY) $(MODULE_LDFLAGS)
++LDFLAGS += -pthread
+
+
+ ifdef GSI_AUTH
=======================================
--- /trunk/RPM/tags/2.5/SPECS/irods.spec Sat May 28 23:11:48 2011
+++ /trunk/RPM/tags/3.0/SPECS/irods.spec Tue May 22 05:37:41 2012
@@ -15,8 +15,8 @@
Summary: IRODS - Integrated Rule-Oriented Data System
Name: irods
Group: System Environment/Daemons
-Version: 2.5
-Release: 2
+Version: 3.0
+Release: 1
License: BSD
Source0: irods%{version}.tgz
Source1: RPM-scripts.tar.gz
@@ -43,8 +43,7 @@
%endif

Patch7: RPMirodsctl.patch
-Patch8: irods_2.5_patch_1
-Patch9: irods_2.5_patch_2
+Patch8: irods3.0-pthread.patch

URL: http://www.irods.org
Packager: Kev O'Neill - STFC
@@ -144,10 +143,7 @@
%endif

%patch7 -p0
-echo "Patch #8:"
-patch -p2 -l -s < ../../SOURCES/irods_2.5_patch_1
-echo "Patch #9:"
-patch -p2 -l -s < ../../SOURCES/irods_2.5_patch_2
+%patch8 -p0

%build
#####################################################################
@@ -158,13 +154,13 @@
%if %{?_with_icat:1}0
# Got to write our own irods.config file in order to specify DB home
%if %{?_with_postgres:1}0
-echo -e "\
+echo "\
\$DATABASE_TYPE = 'postgres';\n\
\$DATABASE_HOME = '%{pgHome}';\n\
\$DATABASE_LIB = 'lib';\n\
" > config/irods.config
%else
-echo -e "\
+echo "\
\$DATABASE_TYPE = 'oracle';\n\
\$DATABASE_HOME = '%{oraHome}';\n\
\$DATABASE_LIB = 'lib';\n\
@@ -175,7 +171,7 @@
# Fix from Geoff Quigley to properly enable GSI
# Allows for GSI SSL libs that are not named according to the Globus
flavour (e.g. VDT)
%if %{?_with_globus:1}0
-echo -e "\$GSI_AUTH=1;\n" >>config/irods.config
+echo "\$GSI_AUTH=1;\n" >>config/irods.config
%endif

# Then run the perl configure script to write build files