[extrods] r252 committed - Get the package names the right way around ;)

0 views

Skip to first unread message

codesite...@google.com

unread,

Jul 14, 2011, 10:46:20 AM7/14/11

to ext...@googlegroups.com

Revision: 252
Author: roger.downing
Date: Thu Jul 14 07:45:17 2011
Log: Get the package names the right way around ;)

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

Modified:
/trunk/RPM/trunk/SPECS/irods.spec

=======================================
--- /trunk/RPM/trunk/SPECS/irods.spec Sat May 28 23:11:48 2011
+++ /trunk/RPM/trunk/SPECS/irods.spec Thu Jul 14 07:45:17 2011
@@ -81,9 +81,9 @@
Group: System Environment/Daemons
Conflicts: irods-pgICAT, irods-oraICAT, irods-pgICAT-GSI, irods-oraICAT-GSI
%if %{?_with_globus:1}0
-Conflicts: irods-server-GSI
-%else
Conflicts: irods-server
+%else
+Conflicts: irods-server-GSI
%endif
%description -n %{serverpackageName}
iRODS, the Integrated Rule-Oriented Data System, is a data grid software
system developed by the Data Intensive Cyber Environments (DICE) group
(developers of the SRB, the Storage Resource Broker), and collaborators.
The iRODS system is based on expertise gained through nearly a decade of
applying the SRB technology in support of Data Grids, Digital Libraries,
Persistent Archives, and Real-time Data Systems. iRODS management policies
(sets of assertions these communities make about their digital collections)
are characterized in iRODS Rules and state information. At the iRODS core,
a Rule Engine interprets the Rules to decide how the system is to respond
to various requests and conditions. iRODS is open source under a BSD
license.
@@ -175,7 +175,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;" >>config/irods.config
%endif