rpms/virtuoso-opensource/devel virtuoso-opensource-5.0.12-zlib.patch, NONE, 1.1 virtuoso-opensource.spec, 1.5, 1.6

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11879

Modified Files:
	virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
fix build using --with-external-zlib


virtuoso-opensource-5.0.12-zlib.patch:
 bif_file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib	2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c	2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
 #endif
 
 #include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
 #include "srvmultibyte.h"
 
 #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- virtuoso-opensource.spec	20 Oct 2009 12:57:05 -0000	1.5
+++ virtuoso-opensource.spec	20 Oct 2009 13:49:49 -0000	1.6
@@ -13,6 +13,12 @@ Source0: http://downloads.sourceforge.ne
 Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
 BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
@@ -22,6 +28,7 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
 BuildRequires: zlib-devel
 
@@ -70,7 +77,9 @@ Requires: %{name} = %{version}-%{release
 
 %prep
 %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
-%patch1 -p1 -b .openssl
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -79,7 +88,10 @@ Requires: %{name} = %{version}-%{release
   --with-layout=redhat \
   --enable-shared --disable-static \
   --without-internal-zlib \
-  --with-debug
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
 make