rpms/virtuoso-opensource/devel virtuoso-opensource-6.1.0-external_iodbc.patch, NONE, 1.1 virtuoso-opensource-6.1.0-nodemos_buildfix.patch, NONE, 1.1 virtuoso-opensource.spec, 1.8, 1.9 virtuoso-opensource-6.1.0-extern-iodbc.patch, 1.1, NONE

Thu Feb 4 17:49:25 UTC 2010

Author: rdieter

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

Modified Files:
	virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-6.1.0-external_iodbc.patch 
	virtuoso-opensource-6.1.0-nodemos_buildfix.patch 
Removed Files:
	virtuoso-opensource-6.1.0-extern-iodbc.patch 
Log Message:
fixup build
build only what we need for nepomuk, Obsoletes: -apps,-conductor


virtuoso-opensource-6.1.0-external_iodbc.patch:
 configure    |    4 ++--
 configure.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE virtuoso-opensource-6.1.0-external_iodbc.patch ---
diff -up virtuoso-opensource-6.1.0/configure.external_iodbc virtuoso-opensource-6.1.0/configure
--- virtuoso-opensource-6.1.0/configure.external_iodbc	2010-02-03 14:54:32.000000000 -0600
+++ virtuoso-opensource-6.1.0/configure	2010-02-04 08:16:53.058591521 -0600
@@ -26773,7 +26773,7 @@ _ACEOF
 #
 if test "x$virt_do_iodbc" = "xyes"
 then
-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
+    iodbc_CPPFLAGS=`pkg-config --cflags libiodbc`
 
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
@@ -26936,7 +26936,7 @@ done
 
     ccincl="$iodbc_CPPFLAGS $ccincl"
 
-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
+    iodbc_LDFLAGS=`pkg-config --libs libiodbc`
     { $as_echo "$as_me:$LINENO: checking for SQLTables in -liodbc" >&5
 $as_echo_n "checking for SQLTables in -liodbc... " >&6; }
 if test "${ac_cv_lib_iodbc_SQLTables+set}" = set; then
diff -up virtuoso-opensource-6.1.0/configure.in.external_iodbc virtuoso-opensource-6.1.0/configure.in
--- virtuoso-opensource-6.1.0/configure.in.external_iodbc	2010-02-03 14:49:18.000000000 -0600
+++ virtuoso-opensource-6.1.0/configure.in	2010-02-04 08:16:51.265605024 -0600
@@ -1833,7 +1833,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if usin
 #
 if test "x$virt_do_iodbc" = "xyes"
 then
-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
+    iodbc_CPPFLAGS=`pkg-config --cflags libiodbc`
 
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
@@ -1842,7 +1842,7 @@ then
 
     ccincl="$iodbc_CPPFLAGS $ccincl"
 
-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
+    iodbc_LDFLAGS=`pkg-config --libs libiodbc`
     AC_CHECK_LIB(iodbc, SQLTables,
 		 [
 		  virt_do_iodbc="yes"

virtuoso-opensource-6.1.0-nodemos_buildfix.patch:
 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE virtuoso-opensource-6.1.0-nodemos_buildfix.patch ---
diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am
--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.buildfix	2009-08-31 03:08:47.000000000 -0500
+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am	2010-02-04 10:08:16.763606447 -0600
@@ -164,6 +164,7 @@ install-data-local:
 	chmod +x install_ini.sh
 	mkdir -p "$(DESTDIR)$(dbdir)"
 	$(SHELL) install_ini.sh database
+if WITH_DEMO_VAD
 if WITH_HTMLDOC
 	mkdir -p "$(DESTDIR)$(htmldocdir)"
 	$(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)"
@@ -173,6 +174,7 @@ if WITH_HTMLDOC
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.png -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.ico -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 endif
+endif
 
 uninstall-local:
 	rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini"


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- virtuoso-opensource.spec	4 Feb 2010 13:27:46 -0000	1.8
+++ virtuoso-opensource.spec	4 Feb 2010 17:49:25 -0000	1.9
@@ -1,4 +1,7 @@
 
+# set to omit demos
+%define _disable_all_vads   --disable-all-vads
+
 Name:	 virtuoso-opensource
 Version: 6.1.0
 Release: 1%{?dist}
@@ -13,11 +16,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
+# based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch
+Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
+Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
 
 BuildRequires: automake libtool
 BuildRequires: bison
@@ -34,6 +37,11 @@ BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
+%if 0%{?_disable_all_vads:1}
+Obsoletes: virtuoso-apps < 6.1.0
+Obsoletes:  virtuoso-conductor < 6.1.0
+%endif
+
 
 %description
 Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML
@@ -78,8 +86,11 @@ 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 .external_iodbc
+%patch52 -p1 -b .nodemos_buildfix
+
+./autogen.sh
 
 
 %build
@@ -89,13 +100,12 @@ Requires: %{name} = %{version}-%{release
   --enable-shared --disable-static \
   --without-internal-zlib \
   --with-debug \
-  --enable-iodbc \
+  --with-iodbc \
   --enable-openssl \
-  --enable-xml \
-  --disable-demo-vad
+  --disable-imagemagick \
+  %{?_disable_all_vads} 
 
-# smp busted
-make
+make %{?_smp_mflags}
 
 
 %install
@@ -103,6 +113,12 @@ rm -rf %{buildroot} 
 
 make install DESTDIR=%{buildroot}
 
+# silly that both binaries with internal vs. external libiodbc get built 
+mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t
+mv %{buildroot}%{_bindir}/isql-iodbc %{buildroot}%{_bindir}/isql
+mv %{buildroot}%{_bindir}/isqlw-iodbc %{buildroot}%{_bindir}/isqlw
+mv %{buildroot}%{_bindir}/odbc_mail %{buildroot}%{_bindir}/virt_mail
+
 mkdir -p %{buildroot}%{_sysconfdir}/virtuoso
 mv %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini %{buildroot}%{_sysconfdir}/virtuoso/
 ln -s ../../../..%{_sysconfdir}/virtuoso/virtuoso.ini %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini
@@ -113,9 +129,14 @@ mv %{buildroot}%{_bindir}/{inifile,isql,
    %{buildroot}%{_libexecdir}/virtuoso/
 
 ## unpackaged files 
+# iodbc-ized version of virt_mail, meh.
+rm -vf %{buildroot}%{_bindir}/odbc_mail
 rm -vf %{buildroot}%{_libdir}/*.{la,a}
 rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la
 rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
+%if 0%{?_disable_all_vads:1}
+#rm -rf %{buildroot}%{_var}/lib/virtuoso/vsp/
+%endif
 
 
 %clean
@@ -136,6 +157,7 @@ rm -rf %{buildroot} 
 %dir %{_var}/lib/virtuoso
 %{_var}/lib/virtuoso/db/
 
+%if ! 0%{?_disable_all_vads:1}
 %files apps
 %defattr(-,root,root,-)
 %{_libdir}/virtuoso/hosting/
@@ -146,6 +168,7 @@ rm -rf %{buildroot} 
 %defattr(-,root,root,-)
 %{_datadir}/virtuoso/vad/conductor_dav.vad
 %{_var}/lib/virtuoso/vsp/
+%endif
 
 %files doc
 %defattr(-,root,root,-)
@@ -160,6 +183,7 @@ rm -rf %{buildroot} 
 %changelog
 * Thu Feb 04 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-1
 - virtuoso-opensource-6.1.0
+- build only what we need for nepomuk, Obsoletes: -apps,-conductor
 
 * Sat Jan 09 2010 Rex Dieter <rdieter at fedoraproject.org> 6.0.0-1
 - virtuoso-opensource-6.0.0


--- virtuoso-opensource-6.1.0-extern-iodbc.patch DELETED ---

