rpms/virtuoso-opensource/devel virtuoso-opensource-6.1.0-extern-iodbc.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 virtuoso-opensource.spec, 1.7, 1.8 virtuoso-opensource-5.0.12-zlib.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-6.1.0-extern-iodbc.patch 
Removed Files:
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
* Thu Feb 04 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-1
- virtuoso-opensource-6.1.0


virtuoso-opensource-6.1.0-extern-iodbc.patch:
 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE virtuoso-opensource-6.1.0-extern-iodbc.patch ---
Index: configure.in
===================================================================
--- configure.in
+++ configure.in	2010-02-04 09:31:49.000000000 +0100
@@ -1833,7 +1833,7 @@
 #
 if test "x$virt_do_iodbc" = "xyes"
 then
-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
+    iodbc_CPPFLAGS=`iodbc-config --cflags`
 
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
@@ -1842,7 +1842,7 @@
 
     ccincl="$iodbc_CPPFLAGS $ccincl"
 
-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
+    iodbc_LDFLAGS=`iodbc-config --libs`
     AC_CHECK_LIB(iodbc, SQLTables,
 		 [
 		  virt_do_iodbc="yes"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Oct 2009 12:57:05 -0000	1.4
+++ .cvsignore	4 Feb 2010 13:27:45 -0000	1.5
@@ -1 +1 @@
-virtuoso-opensource-5.0.12.tar.gz
+virtuoso-opensource-6.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Oct 2009 12:57:05 -0000	1.4
+++ sources	4 Feb 2010 13:27:46 -0000	1.5
@@ -1 +1 @@
-64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz
+49135390d27ab3e445f5e9481ab677bb  virtuoso-opensource-6.1.0.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- virtuoso-opensource.spec	6 Jan 2010 14:07:02 -0000	1.7
+++ virtuoso-opensource.spec	4 Feb 2010 13:27:46 -0000	1.8
@@ -1,6 +1,6 @@
 
 Name:	 virtuoso-opensource
-Version: 5.0.12
+Version: 6.1.0
 Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
@@ -13,10 +13,11 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ## Upstreamable patches
+# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch
+Patch4: virtuoso-opensource-6.1.0-extern-iodbc.patch
+
 # 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
@@ -77,8 +78,8 @@ Requires: %{name} = %{version}-%{release
 %prep
 %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
 
+%patch4 -p0 -b .external_iodbc
 %patch50 -p1 -b .openssl
-%patch51 -p1 -b .zlib
 
 
 %build
@@ -90,7 +91,8 @@ Requires: %{name} = %{version}-%{release
   --with-debug \
   --enable-iodbc \
   --enable-openssl \
-  --enable-xml
+  --enable-xml \
+  --disable-demo-vad
 
 # smp busted
 make
@@ -156,6 +158,12 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Thu Feb 04 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-1
+- virtuoso-opensource-6.1.0
+
+* Sat Jan 09 2010 Rex Dieter <rdieter at fedoraproject.org> 6.0.0-1
+- virtuoso-opensource-6.0.0
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
 - virtuoso-opensource-5.0.12
 


--- virtuoso-opensource-5.0.12-zlib.patch DELETED ---