rpms/condor/F-13 dso_link_change.patch, NONE, 1.1 condor.spec, 1.25, 1.26

matt matt at fedoraproject.org
Thu May 20 21:32:02 UTC 2010


Author: matt

Update of /cvs/pkgs/rpms/condor/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16002

Modified Files:
	condor.spec 
Added Files:
	dso_link_change.patch 
Log Message:
update for dso ld change

dso_link_change.patch:
 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dso_link_change.patch ---
commit f075415e311b24a75f434b6540f68e493141e37d
Author: Matthew Farrellee <matt at redhat.com>
Date:   Thu May 20 17:14:17 2010 -0400

    Updated proper build for Fedora 13, DSO ld change requires explicit linking of dep deps
    
    https://fedoraproject.org/wiki/UnderstandingDSOLinkChange

diff --git a/src/configure.ac b/src/configure.ac
index 3a892e2..645edb8 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3002,7 +3002,9 @@ fi
 
 CHECK_EXTERNAL([krb5], [1.4.3-p0], [soft],
                [use krb5 (provides Kerberos support)],
-               MF_LIB_CHECK([krb5], [[krb5 krb5_free_principal]]))
+               MF_LIB_CHECK([krb5], [[krb5 krb5_free_principal],
+	       			     [k5crypto krb5_c_encrypt],
+				     [com_err error_message]]))
 
 CHECK_EXTERNAL([openssl], [0.9.8h-p2], [soft],
                [use OpenSSL (provides authentication and encryption support)],


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-13/condor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- condor.spec	20 May 2010 13:25:16 -0000	1.25
+++ condor.spec	20 May 2010 21:32:01 -0000	1.26
@@ -31,6 +31,7 @@ Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
 Patch6: log_lock_run.patch
 Patch7: only_dynamic_unstripped.patch
+Patch10: dso_link_change.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -126,6 +127,7 @@ exit 0
 %patch3 -p1
 %patch6 -p1
 %patch7 -p1
+%patch10 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;



More information about the scm-commits mailing list