From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Tue, 12 May 2009 10:14:49 +0000 (+0000)
Subject: Sync
X-Git-Tag: glite-lb-client_R_4_0_2_2~18
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=67dbfa7bbb5637da59d57f69ca335b1a858c11ee;p=jra1mw.git

Sync
---

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index e9092c6..af77054 100644
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -49,7 +49,7 @@ export libdir=lib
 endif
 
 ifndef MYCFLAGS
-export MYCFLAGS=-I. -I../interface $(HTTPD_FLAGS) -I/usr/include/httpd -I/usr/include/apr-0 -I/usr/include/apr-1 -I/opt/glite/include -fPIC
+export MYCFLAGS=-I. -I../interface -I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-0 -I/usr/include/apr-1 -I/usr/include/apr-1.0 -I/opt/glite/include -fPIC -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE $(HTTPD_FLAGS) 
 endif
 
 ifndef MYLDFLAGS
@@ -123,12 +123,12 @@ libgridsite_globus.so.$(VERSION): grst_err_globus.o \
 	gcc -shared -Wl,-soname,libgridsite_globus.so.$(MINOR_VERSION) \
          -o libgridsite_globus.so.$(PATCH_VERSION) \
          grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_xacml_globus.o \
-         grst_http_globus.o grst_asn1_globus.o grst_htcp_globus.o
+         grst_http_globus.o grst_asn1_globus.o
 	ln -sf libgridsite_globus.so.$(VERSION) libgridsite_globus.so
 
 libgridsite_globus.a: grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o grst_asn1_globus.o
 	ar src libgridsite_globus.a \
-               grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o grst_asn1_globus.o grst_htcp_globus.o
+               grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o grst_asn1_globus.o
 
 grst_err_globus.o: grst_err.c ../interface/gridsite.h
 	gcc -g $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \
@@ -557,8 +557,9 @@ rpm: dist
 wtf: 
 	pwd
 	printenv
-	ls -l
-	ls -lR /usr/local/
-	ls -lR $(GSOAPDIR)
+	ls -lR ../../..
+#	ls -l
+#	ls -lR /usr/local/
+#	ls -lR $(GSOAPDIR)
 
 
diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index db0d6c3..8145dc0 100755
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -181,10 +181,16 @@ fi
 
 %files shared
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite.so.%{version}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite.so.${MINOR_VERSION:-1.x}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite.so.${MAJOR_VERSION:-1}
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite.so
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.so.%{version}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.so.${MINOR_VERSION:-1.x}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.so.${MAJOR_VERSION:-1}
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.so
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.so.%{version}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.so.${MINOR_VERSION:-1.x}
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.so.${MAJOR_VERSION:-1}
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.so
 %attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}
 
@@ -193,7 +199,7 @@ fi
 %attr(-, root, root) %{prefix}/include/gridsite-gacl.h
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite.a
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.a
-#%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.a
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.a
 
 %files apache
 %attr(-, root, root) %{prefix}/share/man/man8/mod_gridsite.8.gz