rpms/dcap/F-11 dcap-libs.patch, 1.2, 1.3 dcap.spec, 1.2, 1.3 import.log, 1.2, 1.3

Thu Jun 17 10:52:50 UTC 2010

Author: ellert

Update of /cvs/pkgs/rpms/dcap/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6335/F-11

Modified Files:
	dcap-libs.patch dcap.spec import.log 
Log Message:
* Thu Jun 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.2-2
- Adjust CFLAGS so that the compiled program works correctly


dcap-libs.patch:
 configure.ac    |  339 ++------------------------------------------------------
 src/Makefile.am |    6 
 2 files changed, 21 insertions(+), 324 deletions(-)

Index: dcap-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/dcap-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- dcap-libs.patch	7 Apr 2010 14:00:50 -0000	1.2
+++ dcap-libs.patch	17 Jun 2010 10:52:50 -0000	1.3
@@ -1,6 +1,6 @@
 diff -ur dcap-2.47.2.orig/configure.ac dcap-2.47.2/configure.ac
 --- dcap-2.47.2.orig/configure.ac	2010-04-07 11:19:38.000000000 +0200
-+++ dcap-2.47.2/configure.ac	2010-04-07 13:46:48.557795270 +0200
++++ dcap-2.47.2/configure.ac	2010-04-08 09:00:52.558544366 +0200
 @@ -53,7 +53,6 @@
  AM_PROG_CC_C_O
  AC_SEARCH_LIBS([gethostbyname], [nsl])
@@ -42,7 +42,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
 +nossl=1
 +])
 +AC_CHECK_LIB(crypto,ERR_print_errors_fp,[
-+SSL_LIBS="-lcrypto ${SSL_LIBS}"
++SSL_LIBS="${SSL_LIBS} -lcrypto"
  ],[
  nossl=1
  ])
@@ -113,7 +113,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
  AC_CHECK_LIB(globus_gssapi_gsi,gss_wrap, [
  GLOBUS_EPEL_LIBS="-lglobus_gssapi_gsi ${GLOBUS_EPEL_LIBS}"
  ],[
-@@ -257,133 +210,14 @@
+@@ -257,133 +210,15 @@
  
  dnl == 64pthreads libary checking version ==
  
@@ -179,6 +179,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
 -
  AC_CHECK_LIB(globus_gssapi_gsi_gcc64pthr,gss_wrap, [
  GLOBUS_GCC64PTHR_LIBS="-lglobus_gssapi_gsi_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
++],[
 +GCC64PTHR_LIBS_NOT=1
  ])
  
@@ -248,7 +249,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
  AC_CHECK_LIB(globus_gssapi_gsi_gcc64dbgpthr,gss_wrap, [
  GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
  ],[
-@@ -393,66 +227,6 @@
+@@ -393,66 +228,6 @@
  
  dnl == 32pthreads libary checking version ==
  
@@ -315,7 +316,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
  AC_CHECK_LIB(globus_gssapi_gsi_gcc32pthr,gss_wrap, [
  GLOBUS_GCC32PTHR_LIBS="-lglobus_gssapi_gsi_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
  ],[
-@@ -462,66 +236,6 @@
+@@ -462,66 +237,6 @@
  
  dnl == 32dbgpthr libary checking version ==
  
@@ -382,7 +383,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
  AC_CHECK_LIB(globus_gssapi_gsi_gcc32dbgpthr,gss_wrap, [
  GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
  ],[
-@@ -606,24 +320,6 @@
+@@ -606,24 +321,6 @@
  nokrb=1
  ])
  
@@ -409,7 +410,7 @@ diff -ur dcap-2.47.2.orig/configure.ac d
  
 diff -ur dcap-2.47.2.orig/src/Makefile.am dcap-2.47.2/src/Makefile.am
 --- dcap-2.47.2.orig/src/Makefile.am	2010-04-07 11:19:38.000000000 +0200
-+++ dcap-2.47.2/src/Makefile.am	2010-04-07 12:06:42.888544481 +0200
++++ dcap-2.47.2/src/Makefile.am	2010-04-08 09:00:52.558544366 +0200
 @@ -109,14 +109,14 @@
  lib_LTLIBRARIES = libdcap.la libpdcap.la
  


Index: dcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/dcap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dcap.spec	7 Apr 2010 14:00:50 -0000	1.2
+++ dcap.spec	17 Jun 2010 10:52:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dcap
 Version:	2.47.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Client Tools for dCache
 
 Group:		Applications/Internet
@@ -13,6 +13,7 @@ URL:		http://www.dcache.org/manuals/libd
 #		    dcap-2.47.2
 #		tar -z -c --exclude .svn -f dcap-2.47.2.tar.gz dcap-2.47.2
 Source0:	%{name}-%{version}.tar.gz
+#		Allow loading of plugins outside default library search path
 Patch0:		%{name}-dlopen.patch
 #		Don't install empty documentation files:
 #		http://rb.dcache.org/r/1645
@@ -110,6 +111,8 @@ sed 's!@@LIBDIR@@!%{_libdir}!' -i src/tu
 chmod +x bootstrap.sh
 ./bootstrap.sh
 
+# The defaults optflags creates a broken binary
+export CFLAGS="%optflags -Wp,-U_FORTIFY_SOURCE -fno-strict-aliasing"
 %configure \
     --with-globus-include="%{_includedir}/globus -I%{_libdir}/globus/include" \
     --with-globus-lib=/dummy
@@ -181,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libtelnetTunnel.so
 
 %changelog
+* Thu Jun 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.2-2
+- Adjust CFLAGS so that the compiled program works correctly
+
 * Wed Apr 07 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.2-1
 - New upstream release
 - Drop dcap-adler32.patch - implemented upstream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Apr 2010 14:00:50 -0000	1.2
+++ import.log	17 Jun 2010 10:52:50 -0000	1.3
@@ -1,2 +1,3 @@
 dcap-2_44_0-3_fc12:F-11:dcap-2.44.0-3.fc12.src.rpm:1268849894
 dcap-2_47_2-1_fc12:F-11:dcap-2.47.2-1.fc12.src.rpm:1270648828
+dcap-2_47_2-2_fc12:F-11:dcap-2.47.2-2.fc12.src.rpm:1276771954

