[virtuoso-opensource] make proper optimized build utils: include both normal and iodbc variants utils: include -vt symlink

[Rex Dieter]

commit 2a7acaf2ef30472ea647e76e0c32c29a6d1c4f5b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 18 12:07:19 2012 -0600

    make proper optimized build
    utils: include both normal and iodbc variants
    utils: include -vt symlinks for compatiblity with opensuse packaging

 virtuoso-opensource-6.1.4-no_strip.patch |   14 ++++++++++
 virtuoso-opensource.spec                 |   39 ++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 13 deletions(-)
---
diff --git a/virtuoso-opensource-6.1.4-no_strip.patch b/virtuoso-opensource-6.1.4-no_strip.patch
new file mode 100644
index 0000000..c48784f
--- /dev/null
+++ b/virtuoso-opensource-6.1.4-no_strip.patch
@@ -0,0 +1,14 @@
+diff -up virtuoso-opensource-6.1.4/configure.in.no_strip virtuoso-opensource-6.1.4/configure.in
+--- virtuoso-opensource-6.1.4/configure.in.no_strip	2011-10-28 18:28:08.000000000 -0500
++++ virtuoso-opensource-6.1.4/configure.in	2012-01-18 11:33:50.367289715 -0600
+@@ -632,8 +632,8 @@ if test "x$with_debug" = "xyes"; then
+     CCOPT="-g"
+     AM_LDFLAGS="-g"
+     CCDEBUG=""
+-else
+-    AM_LDFLAGS="-s"
++#else
++#    AM_LDFLAGS="-s"
+ fi
+ 
+ 
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index 69b4960..8203e6f 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -9,7 +9,7 @@
 Name:    virtuoso-opensource
 Epoch:   1
 Version: 6.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -27,9 +27,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # 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
+Patch53: virtuoso-opensource-6.1.4-no_strip.patch
 
 ## Upstream patches
 
+BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gawk
@@ -46,7 +48,6 @@ BuildRequires: pkgconfig(zlib)
 Provides: virtuoso = %{version}-%{release}
 
 %if 0%{?_disable_all_vads:1}
-BuildRequires: automake libtool
 Obsoletes: virtuoso-opensource-apps < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-doc < %{version}-%{release} 
@@ -95,8 +96,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?_disable_all_vads:1}
 %patch52 -p1 -b .nodemos_buildfix
-./autogen.sh
 %endif
+%patch53 -p1 -b .no_strip
+
+# required by both patch52/53
+./autogen.sh
 
 find -name "*.jar"
 find -name "*.jar" -delete
@@ -111,12 +115,10 @@ popd
 
 
 %build
-# --with-debug avoids useless -debuginfo
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
   --without-internal-zlib \
-  --with-debug \
   --with-iodbc=`pwd`/libiodbc \
   --enable-openssl \
   --disable-imagemagick \
@@ -132,18 +134,24 @@ 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
 
 # generic'ish binaries, hide them away safely
-mkdir -p %{buildroot}%{_libexecdir}/virtuoso/
-mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \
-   %{buildroot}%{_libexecdir}/virtuoso/
+pushd %{buildroot}%{_bindir}
+# make links to libexecdir relative, be warned ! -- rex
+mkdir -p ../libexec/virtuoso/
+mv %{buildroot}%{_bindir}/{inifile,isql,isql-iodbc,isqlw,isqlw-iodbc,odbc_mail,virt_mail} \
+  ../libexec/virtuoso/
+ln -s ../libexec/virtuoso/isql isql-vt
+ln -s ../libexec/virtuoso//isql-iodbc isql-iodbc-vt
+ln -s ../libexec/virtuoso/isqlw isqlw-vt
+ln -s ../libexec/virtuoso/isqlw-iodbc isqlw-iodbc-vt
+ln -s ../libexec/virtuoso/odbc_mail odbc_mail-vt
+ln -s ../libexec/virtuoso/virt_mail virt_mail-vt
+popd
 
 ## unpackaged files 
 rm -vf %{buildroot}%{_libdir}/*.{la,a}
@@ -157,7 +165,7 @@ rm -rvf %{buildroot}%{_libdir}/sesame
 
 %check
 ## these take a very long time
-#make check
+%{?_with_check:make check}
 
 
 %clean
@@ -198,11 +206,16 @@ rm -rf %{buildroot}
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/virt_mail
+%{_bindir}/*-vt
 %{_libexecdir}/virtuoso/*
 
 
 %changelog
+* Wed Jan 18 2012 Rex Dieter <rdieter at fedoraproject.org> 1:6.1.4-4
+- make proper optimized build 
+- -utils: include both normal and iodbc variants
+- -utils: include -vt symlinks for compatiblity with opensuse packaging
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:6.1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild