rpms/ruby-ldap/F-11 ruby-ldap-0.9.7-openldap.patch, NONE, 1.1 ruby-ldap.spec, 1.5, 1.6

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/ruby-ldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7170/F-11

Modified Files:
	ruby-ldap.spec 
Added Files:
	ruby-ldap-0.9.7-openldap.patch 
Log Message:
- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch



ruby-ldap-0.9.7-openldap.patch:

--- NEW FILE ruby-ldap-0.9.7-openldap.patch ---
--- ruby-ldap-0.9.7/ldap.c.orig	2009-04-19 23:47:23.000000000 +0200
+++ ruby-ldap-0.9.7/ldap.c	2009-04-19 23:48:30.000000000 +0200
@@ -422,8 +420,8 @@
 #ifdef LDAP_OPT_X_TLS
   rb_ldap_define_opt (LDAP_OPT_X_TLS);
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL);
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_MIN);
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
   rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE);
--- ruby-ldap-0.9.7/conn.c.orig	2009-04-20 00:10:02.000000000 +0200
+++ ruby-ldap-0.9.7/conn.c	2009-04-20 00:10:19.000000000 +0200
@@ -497,8 +497,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
     case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-    case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+    case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
     case LDAP_OPT_X_TLS_CIPHER_SUITE:
@@ -627,8 +627,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
 	case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-	case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
 	case LDAP_OPT_X_TLS_CIPHER_SUITE:


Index: ruby-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ldap/F-11/ruby-ldap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-ldap.spec	25 Feb 2009 21:24:33 -0000	1.5
+++ ruby-ldap.spec	19 Apr 2009 22:35:14 -0000	1.6
@@ -3,12 +3,15 @@
 
 Name:           ruby-ldap
 Version:        0.9.7 
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Ruby LDAP libraries
 Group:          Development/Languages
 License:        BSD 
 URL:            http://%{name}.sourceforge.net/   
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Filed in upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2775056&group_id=66444&atid=514521
+Patch0:         %{name}-0.9.7-openldap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel openldap-devel openssl-devel 
@@ -25,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 find example/ -type f | xargs %{__chmod} 0644
 
 
@@ -52,6 +56,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.7-8
+- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild