Hello community, here is the log from the commit of package virtuoso for openSUSE:Factory checked in at Mon Jun 27 14:44:46 CEST 2011.
-------- --- virtuoso/virtuoso.changes 2011-05-17 13:14:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/virtuoso/virtuoso.changes 2011-06-27 12:48:21.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Jun 27 12:48:10 CEST 2011 - [email protected] + +- add versioned requires + +------------------------------------------------------------------- +Sun Jun 26 09:41:20 UTC 2011 - [email protected] + +- Update to 6.1.3: + * Lots of changes (see NEWS file) +- Spec file updates: + * Changes based on spec-cleaner run. + * openssl in BuildRequires is only needed for openSUSE <= 11.4. + * Added libiodbc-devel and openldap2-devel in BuildRequires. + * Added description for the patches based on openSUSE Patches Guidelines. + * Minor other updates. +- Removed libsrc/Wi/bif_file.c fix from rpmlint-fixes.diff patch (fixed + upstream). +- Added a patch (taken from Fedora) to fix build with external iodbc. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virtuoso-opensource-6.1.2.tar.gz New: ---- virtuoso-opensource-6.1.0-external_iodbc.patch virtuoso-opensource-6.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.FDpb83/_old 2011-06-27 14:30:39.000000000 +0200 +++ /var/tmp/diff_new_pack.FDpb83/_new 2011-06-27 14:30:39.000000000 +0200 @@ -18,28 +18,41 @@ Name: virtuoso -# This .spec builds only a limited subset of Virtuoso that is needed for Soprano. -#define sversion 20091009 - -BuildRequires: bison flex gperf openssl -BuildRequires: fastjar libopenssl-devel libwbxml2-devel libxml2-devel -BuildRequires: ImageMagick-devel -BuildRequires: zlib-devel -BuildRequires: pcre-devel -%if !%sles_version -BuildRequires: htmldoc -%endif -Url: http://virtuoso.openlinksw.com/ +Version: 6.1.3 +Release: 1 License: GPLv2 -Group: Productivity/Databases/Servers Summary: Relational database server with RDF -Version: 6.1.2 -Release: 7 -Source: virtuoso-opensource-%{version}.tar.gz -Patch1: build-sanely.diff -Patch2: rpmlint-fixes.diff +Url: http://virtuoso.openlinksw.com/ +Group: Productivity/Databases/Servers +# http://prdownloads.sourceforge.net/virtuoso/virtuoso-opensource-6.1.3.tar.gz +Source0: virtuoso-opensource-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE build-sanely.diff -- Build only things needed by KDE +Patch0: build-sanely.diff +# PATCH-FIX-OPENSUSE rpmlint-fixes.diff -- Fix "bufferoverflowstrncat" post-build-check error +Patch1: rpmlint-fixes.diff +# PATCH-FIX-OPENSUSE virtuoso-opensource-6.1.0-external_iodbc.patch [email protected] -- Build with external iodbc +Patch2: virtuoso-opensource-6.1.0-external_iodbc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: virtuoso-server virtuoso-drivers +BuildRequires: bison +BuildRequires: fastjar +BuildRequires: flex +BuildRequires: gperf +%if !0%{?sles_version} +BuildRequires: htmldoc +%endif +BuildRequires: libiodbc-devel +BuildRequires: libopenssl-devel +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +BuildRequires: openssl +%endif +BuildRequires: libwbxml2-devel +BuildRequires: openldap2-devel +BuildRequires: pcre-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig(ImageMagick) +BuildRequires: pkgconfig(libxml-2.0) +Requires: virtuoso-drivers = %version +Requires: virtuoso-server = %version %description Virtuoso is an innovative Universal Server platform that delivers @@ -51,9 +64,9 @@ %package -n virtuoso-server License: GPLv2 -Group: Productivity/Databases/Servers Summary: Virtuoso server -Requires: virtuoso-drivers = %version +Group: Productivity/Databases/Servers +Requires: virtuoso-drivers = %{version} %description -n virtuoso-server Virtuoso is an innovative Universal Server platform that delivers @@ -64,8 +77,8 @@ %package -n virtuoso-drivers License: GPLv2 -Group: Productivity/Databases/Servers Summary: Virtuoso ODBC Driver +Group: Productivity/Databases/Servers %description -n virtuoso-drivers Virtuoso is an innovative Universal Server platform that delivers @@ -76,26 +89,34 @@ %prep %setup -q -n virtuoso-opensource-%{version} +%patch0 %patch1 -%patch2 +%patch2 -p1 %build rm -rf libsrc/util/pcrelib - # autogen.sh because of patching Makefile.am - libtoolize -f - ./autogen.sh - %configure --without-internal-zlib --disable-static --with-layout=openSUSE --disable-all-vads - make %{?jobs:-j%jobs} +# autogen.sh because of patching Makefile.am +./autogen.sh +%configure --without-internal-zlib --disable-static --with-layout=openSUSE --disable-all-vads --with-iodbc=%{_prefix} +make %{?_smp_mflags} %install -%makeinstall +%make_install + +# Both binaries with and without libiodbc are built, keep the iodbc one +mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t + +%files +%defattr(-,root,root,-) +%dir %{_defaultdocdir}/virtuoso +%doc %{_defaultdocdir}/virtuoso/* %files -n virtuoso-server -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/virtuoso-t %files -n virtuoso-drivers -%defattr(-,root,root) +%defattr(-,root,root,-) %{_libdir}/virtodbc.la %{_libdir}/virtodbc.so %{_libdir}/virtodbc_r.la @@ -105,9 +126,4 @@ %{_libdir}/virtodbcu_r.la %{_libdir}/virtodbcu_r.so -%files -%defattr(-,root,root) -%dir /usr/share/doc/packages/virtuoso -%doc /usr/share/doc/packages/virtuoso/* - %changelog ++++++ rpmlint-fixes.diff ++++++ --- /var/tmp/diff_new_pack.FDpb83/_old 2011-06-27 14:30:39.000000000 +0200 +++ /var/tmp/diff_new_pack.FDpb83/_new 2011-06-27 14:30:39.000000000 +0200 @@ -1,14 +1,3 @@ ---- libsrc/Wi/bif_file.c.orig -+++ libsrc/Wi/bif_file.c -@@ -3009,7 +3009,7 @@ get_mime_part (int *rfc822, caddr_t szMe - DV_ARRAY_OF_POINTER); - *_result = result; - -- memset (result, 3 * sizeof (caddr_t), 0); -+ memset (result, 0, 3 * sizeof (caddr_t)); - - /* skip the empty lines if in RFC822 header */ - if (*rfc822) --- libsrc/Wi/http_client.c.orig +++ libsrc/Wi/http_client.c @@ -423,7 +423,7 @@ http_cli_negotiate_socks4 (dk_session_t ++++++ virtuoso-opensource-6.1.0-external_iodbc.patch ++++++ 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.2.tar.gz -> virtuoso-opensource-6.1.3.tar.bz2 ++++++ virtuoso/virtuoso-opensource-6.1.2.tar.gz /mounts/work_src_done/STABLE/virtuoso/virtuoso-opensource-6.1.3.tar.bz2 differ: byte 1, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
