rpms/virtuoso-opensource/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 virtuoso-opensource.spec, 1.3, 1.4

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19844

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2009 20:40:58 -0000	1.2
+++ .cvsignore	20 Oct 2009 14:29:17 -0000	1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-5.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jul 2009 20:40:58 -0000	1.2
+++ sources	20 Oct 2009 14:29:17 -0000	1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1  virtuoso-opensource-5.0.11.tar.gz
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/virtuoso-opensource.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- virtuoso-opensource.spec	26 Aug 2009 14:06:35 -0000	1.3
+++ virtuoso-opensource.spec	20 Oct 2009 14:29:17 -0000	1.4
@@ -1,16 +1,24 @@
+
 Name:	 virtuoso-opensource
-Version: 5.0.11
-Release: 4%{?dist}
+Version: 5.0.12
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
 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
@@ -20,7 +28,9 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
@@ -66,8 +76,10 @@ Requires: %{name} = %{version}-%{release
 
 
 %prep
-%setup -q -n virtuoso-opensource-%{version}
-%patch1 -p1 -b .openssl
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -75,7 +87,11 @@ Requires: %{name} = %{version}-%{release
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
-  --with-debug
+  --without-internal-zlib \
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
 make 
@@ -141,6 +157,12 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
 - rebuilt with new openssl