Hello community,
here is the log from the commit of package virtuoso for openSUSE:Factory
checked in at Tue May 17 13:23:30 CEST 2011.
--------
--- virtuoso/virtuoso.changes 2010-12-13 23:26:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtuoso/virtuoso.changes 2011-05-17
13:14:08.054398000 +0200
@@ -1,0 +2,9 @@
+Sun Apr 3 15:28:55 UTC 2011 - crrodrig...@opensuse.org
+
+- Use system zlib
+- Use system pcre
+- Do not include build date in binaries
+- fix swapped memset arguments (memset-with-zero-length)
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtuoso.spec ++++++
--- /var/tmp/diff_new_pack.cKnLMX/_old 2011-05-17 13:17:05.000000000 +0200
+++ /var/tmp/diff_new_pack.cKnLMX/_new 2011-05-17 13:17:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package virtuoso (Version 6.1.2)
+# spec file for package virtuoso
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,6 +24,8 @@
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
@@ -32,7 +34,7 @@
Group: Productivity/Databases/Servers
Summary: Relational database server with RDF
Version: 6.1.2
-Release: 2
+Release: 7
Source: virtuoso-opensource-%{version}.tar.gz
Patch1: build-sanely.diff
Patch2: rpmlint-fixes.diff
@@ -78,14 +80,15 @@
%patch2
%build
+rm -rf libsrc/util/pcrelib
# autogen.sh because of patching Makefile.am
libtoolize -f
./autogen.sh
- %configure --disable-static --with-layout=openSUSE --disable-all-vads
+ %configure --without-internal-zlib --disable-static --with-layout=openSUSE
--disable-all-vads
make %{?jobs:-j%jobs}
%install
- %makeinstall
+%makeinstall
%files -n virtuoso-server
%defattr(-,root,root)
++++++ build-sanely.diff ++++++
--- /var/tmp/diff_new_pack.cKnLMX/_old 2011-05-17 13:17:05.000000000 +0200
+++ /var/tmp/diff_new_pack.cKnLMX/_new 2011-05-17 13:17:05.000000000 +0200
@@ -1,9 +1,9 @@
Build only things needed by KDE, not everything and the kitchensync (which
includes also a lot of testcases).
---- configure.in 2010-02-04 12:33:43.113909799 +0100
-+++ configure.in 2010-02-04 12:31:37.313904838 +0100
-@@ -200,6 +200,23 @@
+--- configure.in.orig
++++ configure.in
+@@ -200,6 +200,23 @@ case ${VIRTUOSO_LAYOUT} in
hostingdir=$libdir/virtuoso/hosting
;;
@@ -27,8 +27,8 @@
[[Ff]][[Rr]][[Ee]][[Ee]][[Bb]][[Ss]][[Dd]]) # FreeBSD
virtuoso_layout=FreeBSD
if test "x$prefix" = "xNONE"
---- libsrc/Makefile.am 2009-05-07 16:08:26.000000000 +0200
-+++ libsrc/Makefile.am 2009-05-07 16:08:31.000000000 +0200
+--- libsrc/Makefile.am.orig
++++ libsrc/Makefile.am
@@ -19,7 +19,7 @@
#
#
@@ -38,9 +38,9 @@
noinst_HEADERS = Dk.h libutil.h
---- Makefile.am 2009/11/22 08:58:58 1.1
-+++ Makefile.am 2009/11/22 08:59:23
-@@ -23,7 +23,7 @@
+--- Makefile.am.orig
++++ Makefile.am
+@@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = gnu
ACLOCAL_AMFLAGS = -I binsrc/config
@@ -49,8 +49,8 @@
dist_doc_DATA = \
AUTHORS \
---- binsrc/Makefile.am 2009/11/22 08:59:03 1.1
-+++ binsrc/Makefile.am 2009/11/22 08:59:23
+--- binsrc/Makefile.am.orig
++++ binsrc/Makefile.am
@@ -19,7 +19,7 @@
#
#
@@ -60,9 +60,9 @@
# ----------------------------------------------------------------------
---- binsrc/virtuoso/Makefile.am 2009/11/22 08:59:08 1.1
-+++ binsrc/virtuoso/Makefile.am 2009/11/22 08:59:23
-@@ -41,7 +41,7 @@
+--- binsrc/virtuoso/Makefile.am.orig
++++ binsrc/virtuoso/Makefile.am
+@@ -41,7 +41,7 @@ endif
LIBS += @ZLIB_LIB@
@@ -71,3 +71,105 @@
bin_PROGRAMS = virtuoso-t $(IODBC_PROGS)
noinst_SCRIPTS = virtuoso
+--- libsrc/util/Makefile.am.orig
++++ libsrc/util/Makefile.am
+@@ -32,6 +32,7 @@ libutil_la_CFLAGS += -I$(top_srcdir)/li
+ libutil_la_CFLAGS += -I$(top_srcdir)/libsrc/Dk
+ libutil_la_CFLAGS += -DSUPPORT_UTF8
+ libutil_la_LDFLAGS = -prefer-pic
++libutil_la_LIBADD = -lpcre
+
+ libutil_la_SOURCES = \
+ buildarg.c \
+@@ -85,24 +86,7 @@ libutil_la_SOURCES = \
+ virt_mbsnrtowcs.c \
+ virt_wcrtomb.c \
+ virt_wcs_mask.c \
+- virt_wcsnrtombs.c \
+- pcrelib/pcre_chartables.c \
+- pcrelib/pcre_compile.c \
+- pcrelib/pcre_config.c \
+- pcrelib/pcre_dfa_exec.c \
+- pcrelib/pcre_exec.c \
+- pcrelib/pcre_fullinfo.c \
+- pcrelib/pcre_get.c \
+- pcrelib/pcre_globals.c \
+- pcrelib/pcre_newline.c \
+- pcrelib/pcre_ord2utf8.c \
+- pcrelib/pcre_study.c \
+- pcrelib/pcre_tables.c \
+- pcrelib/pcre_try_flipped.c \
+- pcrelib/pcre_ucd.c \
+- pcrelib/pcre_valid_utf8.c \
+- pcrelib/pcre_version.c \
+- pcrelib/pcre_xclass.c
++ virt_wcsnrtombs.c
+
+
+ BUILT_SOURCES = getdate.c
+@@ -121,11 +105,6 @@ EXTRA_DIST = \
+ getdate.y \
+ MSG_BG.bin \
+ MSG_EN.bin \
+- pcrelib/AUTHORS \
+- pcrelib/LICENCE \
+- pcrelib/*.c \
+- pcrelib/*.h \
+- pcrelib/*.src \
+ win32/ptrlong.h \
+ win32/syslog.c \
+ win32/syslog.h \
+--- libsrc/Wi/bif_regexp.c.orig
++++ libsrc/Wi/bif_regexp.c
+@@ -28,7 +28,7 @@
+ #include "multibyte.h"
+ #include "srvmultibyte.h"
+
+-#include "util/pcrelib/pcre.h"
++#include <pcre.h>
+
+ /*
+ typedef struct rx_query_s {
+--- libsrc/Wi/xqf.c.orig
++++ libsrc/Wi/xqf.c
+@@ -38,7 +38,7 @@
+ #include "xpf.h"
+ #include "xqf.h"
+
+-#include "util/pcrelib/pcre.h"
++#include <pcre.h>
+
+ #define ecm_isname(c) \
+ ( ((c) & ~0xFF) ? (ecm_utf8props[(c)] & ECM_ISNAME) : \
+--- libsrc/Xml.new/datatypes.c.orig
++++ libsrc/Xml.new/datatypes.c
+@@ -25,7 +25,7 @@
+
+ #include "xmlparser_impl.h"
+ #include "schema.h"
+-#include "pcre.h"
++#include <pcre.h>
+
+ ptrlong
+ xs_get_primitive_typeidx (vxml_parser_t * parser, xs_component_t *type)
+--- libsrc/Wi/Makefile.am.orig
++++ libsrc/Wi/Makefile.am
+@@ -490,6 +490,7 @@ libwi_la_SOURCES += \
+
+ libwi_la_CFLAGS = $(libwi_base_la_cflags)
+ libwi_la_LDLAGS = -static
++libwi_la_LIBADD = -lpcre
+
+ #KUBL_UNIV_FILES_ODBC
+ libwi_odbc_la_SOURCES += \
+--- libsrc/Wi/sqlver.c.orig
++++ libsrc/Wi/sqlver.c
+@@ -28,7 +28,7 @@
+ #include "sqlver.h"
+ #include "wi.h"
+
+-char *build_date = __DATE__; /* eg. Jul 16 1996 */
++char *build_date = "??? ?? ????"; /* eg. Jul 16 1996 */
+
+ /* IvAn/VC6port/000725 VC6 has a bug: you can't use /D NAME="\"string\""
cmd-line arg sometimes */
+ #ifdef _MSC_VER
++++++ rpmlint-fixes.diff ++++++
--- /var/tmp/diff_new_pack.cKnLMX/_old 2011-05-17 13:17:05.000000000 +0200
+++ /var/tmp/diff_new_pack.cKnLMX/_new 2011-05-17 13:17:05.000000000 +0200
@@ -1,6 +1,17 @@
---- libsrc/Wi/http_client.c.sav 2009-10-10 21:26:33.000000000 +0200
-+++ libsrc/Wi/http_client.c 2009-10-10 21:38:06.000000000 +0200
-@@ -412,7 +412,7 @@
+--- 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
socksreq[8] = 0; /* no name */
if (name)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
