From dda6e6c92a0df55ecc24c915baf41b978c2953eb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:16:45 +0000 Subject: [PATCH 01/50] Initialize branch F-12 for virtuoso-opensource --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 12ec77ad121787d0990fc63ac36538d750d7a095 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2009 14:29:17 +0000 Subject: [PATCH 02/50] - virtuoso-opensource-5.0.12 --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource.spec | 34 ++++++++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bec1d4..f1755fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-5.0.11.tar.gz +virtuoso-opensource-5.0.12.tar.gz diff --git a/sources b/sources index 4f65f18..493e4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d5507b2a8d244c62f32f1203f10b9d1 virtuoso-opensource-5.0.11.tar.gz +64949660e3f053ec43d00519a19751aa virtuoso-opensource-5.0.12.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d997d20..28dcb30 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -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 5.0.12-1 +- virtuoso-opensource-5.0.12 + +* Sun Oct 11 2009 Rex Dieter 5.0.12-0.1.rc9.20090916 +- virtuoso-opensource-20090916 (5.0.12-rc9) + * Wed Aug 26 2009 Tomas Mraz - 5.0.11-4 - rebuilt with new openssl From f1d88a00300ea621b7eb38ec38038478ab9bb442 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2009 14:34:41 +0000 Subject: [PATCH 03/50] import --- virtuoso-opensource-5.0.12-zlib.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 virtuoso-opensource-5.0.12-zlib.patch diff --git a/virtuoso-opensource-5.0.12-zlib.patch b/virtuoso-opensource-5.0.12-zlib.patch new file mode 100644 index 0000000..00b7a66 --- /dev/null +++ b/virtuoso-opensource-5.0.12-zlib.patch @@ -0,0 +1,18 @@ +diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c +--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib 2009-10-16 05:27:36.000000000 -0500 ++++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c 2009-10-20 08:42:56.060132625 -0500 +@@ -57,7 +57,13 @@ + #endif + + #include "zlib.h" +-#include "zutil.h" ++/* #include "zutil.h" */ ++#if MAX_MEM_LEVEL >= 8 ++# define DEF_MEM_LEVEL 8 ++#else ++# define DEF_MEM_LEVEL MAX_MEM_LEVEL ++#endif ++ + #include "srvmultibyte.h" + + #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ From 7a82c5aae2acf2f069d0f35fd90d903fc5122e68 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:40 +0000 Subject: [PATCH 04/50] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58eec6e..a3f7440 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: virtuoso-opensource -# $Id$ +# $Id: Makefile,v 1.1 2009/07/26 20:07:12 kevin Exp $ NAME := virtuoso-opensource SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f23a53690541c358925c7fef64082f30ba28a214 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Feb 2010 18:23:53 +0000 Subject: [PATCH 05/50] - virtuoso-opensource-6.1.0 - build only what we need for nepomuk, Obsoletes: -apps,-conductor --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource-5.0.12-zlib.patch | 18 -------- ...uoso-opensource-6.1.0-external_iodbc.patch | 42 +++++++++++++++++ ...so-opensource-6.1.0-nodemos_buildfix.patch | 38 +++++++++++++++ virtuoso-opensource.spec | 46 +++++++++++++++---- 6 files changed, 119 insertions(+), 29 deletions(-) delete mode 100644 virtuoso-opensource-5.0.12-zlib.patch create mode 100644 virtuoso-opensource-6.1.0-external_iodbc.patch create mode 100644 virtuoso-opensource-6.1.0-nodemos_buildfix.patch diff --git a/.cvsignore b/.cvsignore index f1755fc..cba1459 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-5.0.12.tar.gz +virtuoso-opensource-6.1.0.tar.gz diff --git a/sources b/sources index 493e4e6..fd355d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64949660e3f053ec43d00519a19751aa virtuoso-opensource-5.0.12.tar.gz +49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.tar.gz diff --git a/virtuoso-opensource-5.0.12-zlib.patch b/virtuoso-opensource-5.0.12-zlib.patch deleted file mode 100644 index 00b7a66..0000000 --- a/virtuoso-opensource-5.0.12-zlib.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c ---- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib 2009-10-16 05:27:36.000000000 -0500 -+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c 2009-10-20 08:42:56.060132625 -0500 -@@ -57,7 +57,13 @@ - #endif - - #include "zlib.h" --#include "zutil.h" -+/* #include "zutil.h" */ -+#if MAX_MEM_LEVEL >= 8 -+# define DEF_MEM_LEVEL 8 -+#else -+# define DEF_MEM_LEVEL MAX_MEM_LEVEL -+#endif -+ - #include "srvmultibyte.h" - - #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ diff --git a/virtuoso-opensource-6.1.0-external_iodbc.patch b/virtuoso-opensource-6.1.0-external_iodbc.patch new file mode 100644 index 0000000..55a4915 --- /dev/null +++ b/virtuoso-opensource-6.1.0-external_iodbc.patch @@ -0,0 +1,42 @@ +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" diff --git a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch new file mode 100644 index 0000000..f6d2796 --- /dev/null +++ b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -0,0 +1,38 @@ +diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -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" +diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 +@@ -24,6 +24,7 @@ + #dist_httproot_DATA = *.html *.css *.txt + + install-data-local: ++if WITH_DEMO_VAD + @echo Installing in "$(httprootdir)" + mkdir -p "$(DESTDIR)$(httprootdir)" + mkdir -p "$(DESTDIR)$(httprootdir)"/images +@@ -37,6 +38,7 @@ install-data-local: + $(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images + $(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images + $(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx ++endif + + + uninstall-local: diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 28dcb30..d59b588 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -1,6 +1,9 @@ +# set to omit demos +%define _disable_all_vads --disable-all-vads + Name: virtuoso-opensource -Version: 5.0.12 +Version: 6.1.0 Release: 1%{?dist} Summary: A high-performance object-relational SQL database @@ -10,14 +13,14 @@ License: GPLv2 with exceptions URL: http://virtuoso.sourceforge.net/ 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 +# 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 @@ -79,7 +87,10 @@ Requires: %{name} = %{version}-%{release} %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} %patch50 -p1 -b .openssl -%patch51 -p1 -b .zlib +%patch51 -p1 -b .external_iodbc +%patch52 -p1 -b .nodemos_buildfix + +./autogen.sh %build @@ -89,12 +100,12 @@ Requires: %{name} = %{version}-%{release} --enable-shared --disable-static \ --without-internal-zlib \ --with-debug \ - --enable-iodbc \ + --with-iodbc \ --enable-openssl \ - --enable-xml + --disable-imagemagick \ + %{?_disable_all_vads} -# smp busted -make +make %{?_smp_mflags} %install @@ -102,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 @@ -112,6 +129,8 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \ %{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 @@ -135,6 +154,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/ @@ -145,6 +165,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ +%endif %files doc %defattr(-,root,root,-) @@ -157,6 +178,13 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2010 Rex Dieter 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 6.0.0-1 +- virtuoso-opensource-6.0.0 + * Tue Oct 20 2009 Rex Dieter 5.0.12-1 - virtuoso-opensource-5.0.12 From f570e73e2136d82bf89084d2b5cb174a46ba04a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Feb 2010 00:51:58 +0000 Subject: [PATCH 06/50] - fix Obsoletes: -apps,-conductor --- virtuoso-opensource.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d59b588..af09771 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -4,7 +4,7 @@ Name: virtuoso-opensource Version: 6.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -38,8 +38,8 @@ 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 +Obsoletes: virtuoso-opensource-apps < 6.1.0 +Obsoletes: virtuoso-opensource-conductor < 6.1.0 %endif @@ -136,6 +136,11 @@ rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar +%check +## these take a very long time +#make check + + %clean rm -rf %{buildroot} @@ -178,6 +183,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 09 2010 Rex Dieter 6.1.0-2 +- fix Obsoletes: -apps,-conductor + * Thu Feb 04 2010 Rex Dieter 6.1.0-1 - virtuoso-opensource-6.1.0 - build only what we need for nepomuk, Obsoletes: -apps,-conductor From 85b6ac3d3e742204bde151f989b28f4eeb43a38e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 10 May 2010 20:14:10 +0000 Subject: [PATCH 07/50] - virtuoso-opensource-6.1.1 - Obsoletes: -doc --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource-5.0.11-openssl.patch | 114 ----------------------- virtuoso-opensource.spec | 26 +++--- 4 files changed, 16 insertions(+), 128 deletions(-) delete mode 100644 virtuoso-opensource-5.0.11-openssl.patch diff --git a/.cvsignore b/.cvsignore index cba1459..f7a2c2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-6.1.0.tar.gz +virtuoso-opensource-6.1.1.tar.gz diff --git a/sources b/sources index fd355d3..3e12bc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.tar.gz +0695bffacf78e53733c27e96c9d7f9e7 virtuoso-opensource-6.1.1.tar.gz diff --git a/virtuoso-opensource-5.0.11-openssl.patch b/virtuoso-opensource-5.0.11-openssl.patch deleted file mode 100644 index 2c959de..0000000 --- a/virtuoso-opensource-5.0.11-openssl.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c ---- virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl 2009-04-17 22:07:28.000000000 +0200 -+++ virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c 2009-08-26 16:03:23.000000000 +0200 -@@ -4798,7 +4798,11 @@ dk_ssl_free (void *old) - static void - ssl_server_init () - { -+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) -+ const SSL_METHOD *ssl_server_method = NULL; -+#else - SSL_METHOD *ssl_server_method = NULL; -+#endif - unsigned char tmp[1024]; - #ifndef NO_THREAD - char err_buf[1024]; -@@ -4888,12 +4892,12 @@ ssl_server_init () - SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context); - - skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx); -- if (sk_num ((STACK *) skCAList) == 0) -+ if (sk_X509_NAME_num (skCAList) == 0) - log_warning ("ODBC X509 Client authentication requested but no CA known for verification"); -- for (i = 0; i < sk_num ((STACK *) skCAList); i++) -+ for (i = 0; i < sk_X509_NAME_num (skCAList); i++) - { - char ca_buf[1024]; -- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i); -+ X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i); - if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf))) - log_debug ("ODBC Server Using X509 Client CA %s", ca_buf); - } -@@ -5058,7 +5062,7 @@ ssl_setup: - - if (ca && ca[0] != 0) - { -- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free); -+ sk_X509_pop_free (ca_list, X509_free); - ca_list = NULL; - ca_list = PEM_load_certs (ca, passwd); - } -@@ -5067,30 +5071,30 @@ ssl_setup: - { - X509_free (cert); - EVP_PKEY_free (pkey); -- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free); -+ sk_X509_pop_free (ca_list, X509_free); - return 0; - } - EVP_PKEY_free (pkey); - if (!SSL_use_certificate (ssl, cert)) - { - X509_free (cert); -- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free); -+ sk_X509_pop_free (ca_list, X509_free); - return 0; - } - X509_free (cert); - - if (!SSL_check_private_key (ssl)) - { -- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free); -+ sk_X509_pop_free (ca_list, X509_free); - return 0; - } -- for (i = 0; i < sk_num ((STACK *) ca_list); i++) -+ for (i = 0; i < sk_X509_num (ca_list); i++) - { -- X509 *ca = (X509 *) sk_value ((STACK *) ca_list, i); -+ X509 *ca = sk_X509_value (ca_list, i); - SSL_add_client_CA (ssl, ca); - X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca); - } -- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free); -+ sk_X509_pop_free (ca_list, X509_free); - return 1; - } - -diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c ---- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl 2009-04-19 23:48:56.000000000 +0200 -+++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c 2009-08-26 16:28:03.000000000 +0200 -@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list - SSL_CTX_set_client_CA_list (ssl_ctx, skCAList); - skCAList = SSL_CTX_get_client_CA_list(ssl_ctx); - -- if (sk_num((STACK *) skCAList) == 0) -+ if (sk_X509_NAME_num(skCAList) == 0) - log_warning ("HTTPS Client authentication requested but no CA known for verification"); - -- for (i = 0; i < sk_num((STACK *) skCAList); i++) -+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++) - { - char ca_buf[1024]; -- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i); -+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i); - if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf))) - log_debug ("HTTPS Using X509 Client CA %s", ca_buf); - } -@@ -9697,13 +9697,13 @@ http_init_part_two () - - SSL_CTX_set_client_CA_list (ssl_ctx, skCAList); - skCAList = SSL_CTX_get_client_CA_list (ssl_ctx); -- if (sk_num((STACK *) skCAList) == 0) -+ if (sk_X509_NAME_num(skCAList) == 0) - log_warning ("HTTPS Client authentication requested but no CA known for verification"); - -- for (i = 0; i < sk_num((STACK *) skCAList); i++) -+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++) - { - char ca_buf[1024]; -- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i); -+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i); - if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf))) - log_debug ("HTTPS Using X509 Client CA %s", ca_buf); - } diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index af09771..0d85024 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -3,8 +3,8 @@ %define _disable_all_vads --disable-all-vads Name: virtuoso-opensource -Version: 6.1.0 -Release: 2%{?dist} +Version: 6.1.1 +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -16,8 +16,6 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -# 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 @@ -40,6 +38,7 @@ Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} Obsoletes: virtuoso-opensource-apps < 6.1.0 Obsoletes: virtuoso-opensource-conductor < 6.1.0 +Obsoletes: virtuoso-opensource-doc < 6.1.1 %endif @@ -59,9 +58,7 @@ Requires: %{name} = %{version}-%{release} Summary: Server pages Group: Applications/Databases Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description conductor %{summary}. @@ -69,9 +66,7 @@ BuildArch: noarch Summary: Documentation Group: Documentation Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description doc %{summary}. @@ -86,7 +81,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} -%patch50 -p1 -b .openssl %patch51 -p1 -b .external_iodbc %patch52 -p1 -b .nodemos_buildfix @@ -133,7 +127,11 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \ 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 -rvf %{buildroot}%{_docdir}/virtuoso/ +rm -rvf %{buildroot}%{_libdir}/sesame/ +rm -vf %{buildroot}%{_libdir}/{hibernate,jdbc-?.?,jena,sesame}/*.jar +%endif %check @@ -147,7 +145,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING LICENSE +%doc AUTHORS ChangeLog COPYING CREDITS LICENSE %dir %{_sysconfdir}/virtuoso/ %config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini %{_bindir}/virtuoso-t @@ -170,11 +168,11 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ -%endif %files doc %defattr(-,root,root,-) %{_docdir}/virtuoso/ +%endif %files utils %defattr(-,root,root,-) @@ -183,6 +181,10 @@ rm -rf %{buildroot} %changelog +* Mon May 10 2010 Rex Dieter 6.1.1-1 +- virtuoso-opensource-6.1.1 +- Obsoletes: -doc + * Tue Feb 09 2010 Rex Dieter 6.1.0-2 - fix Obsoletes: -apps,-conductor From 09ea50eb6323ac818ab383e44e9e44042fd0ea13 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Jul 2010 14:58:01 +0000 Subject: [PATCH 08/50] - virtuoso-opensource-6.1.2 --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f7a2c2a..b1b4513 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-6.1.1.tar.gz +virtuoso-opensource-6.1.2.tar.gz diff --git a/sources b/sources index 3e12bc1..2eaf4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0695bffacf78e53733c27e96c9d7f9e7 virtuoso-opensource-6.1.1.tar.gz +0519e1f104428e0c8b25fad89e3c57ef virtuoso-opensource-6.1.2.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 0d85024..c2a1276 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -3,7 +3,7 @@ %define _disable_all_vads --disable-all-vads Name: virtuoso-opensource -Version: 6.1.1 +Version: 6.1.2 Release: 1%{?dist} Summary: A high-performance object-relational SQL database @@ -181,6 +181,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 Rex Dieter 6.1.2-1 +- virtuoso-opensource-6.1.2 + * Mon May 10 2010 Rex Dieter 6.1.1-1 - virtuoso-opensource-6.1.1 - Obsoletes: -doc From 262e67f855dffea7688d4c958f125be6e5f5b3ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:05:37 +0000 Subject: [PATCH 09/50] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a3f7440..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virtuoso-opensource -# $Id: Makefile,v 1.1 2009/07/26 20:07:12 kevin Exp $ -NAME := virtuoso-opensource -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 72c17df..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virtuoso-opensource-5_0_11-3_fc11:HEAD:virtuoso-opensource-5.0.11-3.fc11.src.rpm:1248640731 From 2495aeb8abb41997ed7b4a0444e791e279227e99 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 13 Jan 2011 12:41:09 -0600 Subject: [PATCH 10/50] - don't autogen.sh things by default --- virtuoso-opensource.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 3f368f1..4e08375 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,7 +7,7 @@ Name: virtuoso-opensource Version: 6.1.3 -Release: 0.1.%{pre}.%{snap}%{?dist} +Release: 0.2.%{pre}.%{snap}%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -26,7 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch -BuildRequires: automake libtool BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -42,6 +41,7 @@ BuildRequires: zlib-devel 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} @@ -88,9 +88,11 @@ Requires: %{name} = %{version}-%{release} %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} #patch51 -p1 -b .external_iodbc -%patch52 -p1 -b .nodemos_buildfix +%if 0%{?_disable_all_vads:1} +%patch52 -p1 -b .nodemos_buildfix ./autogen.sh +%endif find -name "*.jar" find -name "*.jar" -delete @@ -196,6 +198,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 13 2011 Rex Dieter 6.1.3-0.2.rc3.20110105 +- don't autogen.sh things by default + * Thu Jan 06 2011 Rex Dieter 6.1.3-0.1.rc3.20110105 - virtuoso-opensource-6-20110105 snapshot From bf421228dacdc18f266854c8af928dc97dfdae65 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 14 Jan 2011 07:09:29 -0600 Subject: [PATCH 11/50] - don't autogen.sh things by default --- virtuoso-opensource.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index bc7e90b..bbe0c39 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,7 +7,7 @@ Name: virtuoso-opensource Version: 6.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -26,7 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch -BuildRequires: automake libtool BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -42,6 +41,7 @@ BuildRequires: zlib-devel 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} @@ -88,9 +88,11 @@ Requires: %{name} = %{version}-%{release} %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} #patch51 -p1 -b .external_iodbc -%patch52 -p1 -b .nodemos_buildfix +%if 0%{?_disable_all_vads:1} +%patch52 -p1 -b .nodemos_buildfix ./autogen.sh +%endif find -name "*.jar" find -name "*.jar" -delete @@ -196,6 +198,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 13 2011 Rex Dieter 6.1.2-3 +- don't autogen.sh things by default + * Thu Oct 21 2010 Pierre-Yves Chibon 6.1.2-2 - Enable creation subpackage -conductor - Remove all .jar from sources before building From 2e4a26e0e525f0889f76245a3534541a05c00dcc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 14 Jan 2011 07:44:26 -0600 Subject: [PATCH 12/50] can't do noarch subpkg's on el5 --- virtuoso-opensource.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index bbe0c39..2716766 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -64,7 +64,9 @@ Requires: %{name} = %{version}-%{release} Summary: Server pages Group: Applications/Databases Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 BuildArch: noarch +%endif %description conductor %{summary}. @@ -72,7 +74,9 @@ BuildArch: noarch Summary: Documentation Group: Documentation Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 BuildArch: noarch +%endif %description doc %{summary}. From 90376ab656913de1748fcb06a499984f94e924f7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:40:58 -0600 Subject: [PATCH 13/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 4e08375..838288c 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,7 +7,7 @@ Name: virtuoso-opensource Version: 6.1.3 -Release: 0.2.%{pre}.%{snap}%{?dist} +Release: 0.3.%{pre}.%{snap}%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -198,6 +198,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 6.1.3-0.3.rc3.20110105 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jan 13 2011 Rex Dieter 6.1.3-0.2.rc3.20110105 - don't autogen.sh things by default From c531a2446a29247074705434254eefbffd831156 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Jul 2011 12:10:33 -0500 Subject: [PATCH 14/50] 6.1.3 (final) epoch++ (to allow upgrade from f15's 1:6.1.2-3) --- .gitignore | 2 +- sources | 2 +- virtuoso-opensource.spec | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0e05b9f..5ab4eec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /virtuoso-opensource-6.1.2.tar.gz -/virtuoso-opensource-6-20110105.tar.gz +/virtuoso-opensource-6.1.3.tar.gz diff --git a/sources b/sources index c88f734..092f81e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d406b41d0b3b4636d07b06d16331827 virtuoso-opensource-6-20110105.tar.gz +7d4b0497411ff1c34d7ca247618cdd17 virtuoso-opensource-6.1.3.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 838288c..5cadb9b 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -2,12 +2,10 @@ # set to omit demos #define _disable_all_vads --disable-all-vads -%define pre rc3 -%define snap 20110105 - Name: virtuoso-opensource +Epoch: 1 Version: 6.1.3 -Release: 0.3.%{pre}.%{snap}%{?dist} +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -56,14 +54,14 @@ functionality. %package apps Summary: Applications Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description apps %{summary}. %package conductor Summary: Server pages Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description conductor %{summary}. @@ -71,7 +69,7 @@ BuildArch: noarch %package doc Summary: Documentation Group: Documentation -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description doc %{summary}. @@ -79,7 +77,7 @@ BuildArch: noarch %package utils Summary: Utilities Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils %{summary}. @@ -198,6 +196,10 @@ rm -rf %{buildroot} %changelog +* Fri Jul 08 2011 Rex Dieter 6.1.3-1 +- 6.1.3 (final) +- epoch++ (to allow upgrade from f15's 1:6.1.2-3) + * Mon Feb 07 2011 Fedora Release Engineering - 6.1.3-0.3.rc3.20110105 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 9eab49e2351d7555c0e4b9afc71de53a0dace18a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Sep 2011 12:27:47 -0500 Subject: [PATCH 15/50] upstream patch to fix encoding errors (#728857, kde#271664) --- virtuoso-opensource-6.1.3-encoding.patch | 21 +++++++++++++++++++++ virtuoso-opensource.spec | 12 +++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 virtuoso-opensource-6.1.3-encoding.patch diff --git a/virtuoso-opensource-6.1.3-encoding.patch b/virtuoso-opensource-6.1.3-encoding.patch new file mode 100644 index 0000000..30046d2 --- /dev/null +++ b/virtuoso-opensource-6.1.3-encoding.patch @@ -0,0 +1,21 @@ +Index: libsrc/Wi/xqf.c +=================================================================== +RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v +retrieving revision 1.21.2.9 +retrieving revision 1.21.2.12 +diff -u -r1.21.2.9 -r1.21.2.12 +--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 ++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 +@@ -3520,6 +3552,12 @@ + desc = xqf_str_parser_descs + desc_idx; + if (DV_DB_NULL == arg_dtp) + return NEW_DB_NULL; ++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ ++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) ++ { ++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); ++ goto res_ready; ++ } + if (DV_STRING != arg_dtp) + { + caddr_t err = NULL; diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 5cadb9b..001e982 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -5,7 +5,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -24,6 +24,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch +## Upstream patches +# nepomuk encoding error +# https://bugzilla.redhat.com/728857 +# http://bugs.kde.org/271664 +Patch100: virtuoso-opensource-6.1.3-encoding.patch + BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -86,6 +92,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} #patch51 -p1 -b .external_iodbc +%patch100 -p0 -b .encoding %if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix @@ -196,6 +203,9 @@ rm -rf %{buildroot} %changelog +* Wed Sep 14 2011 Rex Dieter 6.1.3-2 +- upstream patch to fix encoding errors (#728857, kde#271664) + * Fri Jul 08 2011 Rex Dieter 6.1.3-1 - 6.1.3 (final) - epoch++ (to allow upgrade from f15's 1:6.1.2-3) From 917600ab63f95bf4feabc19441adc976768b32dd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Oct 2011 13:51:01 -0500 Subject: [PATCH 16/50] respin, enable 'make check' --- virtuoso-opensource.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 001e982..28f9285 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -5,7 +5,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -158,7 +158,7 @@ rm -rvf %{buildroot}%{_libdir}/sesame %check ## these take a very long time -#make check +make check %clean @@ -203,6 +203,9 @@ rm -rf %{buildroot} %changelog +* Tue Oct 11 2011 Rex Dieter 6.1.3-2.1 +- respin, enable 'make check' + * Wed Sep 14 2011 Rex Dieter 6.1.3-2 - upstream patch to fix encoding errors (#728857, kde#271664) From bbd9e77d47d870292c27de918543445dec9f84b5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Oct 2011 15:22:30 -0500 Subject: [PATCH 17/50] gawk4 patch Requires: gawk --- virtuoso-opensource-6.1.3-gawk4.patch | 22 ++++++++++++++++++++++ virtuoso-opensource.spec | 13 ++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 virtuoso-opensource-6.1.3-gawk4.patch diff --git a/virtuoso-opensource-6.1.3-gawk4.patch b/virtuoso-opensource-6.1.3-gawk4.patch new file mode 100644 index 0000000..5337fab --- /dev/null +++ b/virtuoso-opensource-6.1.3-gawk4.patch @@ -0,0 +1,22 @@ +diff -u -r1.51.2.7 libsrc/Wisql_to_c.awk +--- libsrc/Wi/sql_to_c.aw 27 Oct 2010 12:31:21 -0000 1.51.2.7 ++++ libsrc/Wi/sql_to_c.awk 30 Aug 2011 14:30:58 -0000 +@@ -339,9 +339,17 @@ + if (length() < 2) + next + } ++ + # does escape the symbols + fun = $0 +- gsub ( /\\/, "\\\\", fun) ++ q = "\\\\" ++ if (PROCINFO["version"] ~ /^4/) ++ gsub ( q, q q, fun) ++ else ++ gsub ( q, q, fun) ++ ++ #WAS: gsub ( /\\/, "\\\\", fun) ++ + # remove whitespace except when there is just a semicolon + if ((in_xsl_mode == 0) && (in_xsd_mode == 0)) + { diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 28f9285..2add880 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -5,7 +5,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.3 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -29,9 +29,14 @@ Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch # https://bugzilla.redhat.com/728857 # http://bugs.kde.org/271664 Patch100: virtuoso-opensource-6.1.3-encoding.patch +# http://lwn.net/Articles/451578/ +# https://sourceforge.net/tracker/?func=detail&aid=3358418&group_id=161622&atid=820574 +# gawk4 compatibility +Patch101: virtuoso-opensource-6.1.3-gawk4.patch BuildRequires: bison BuildRequires: flex +BuildRequires: gawk BuildRequires: gperf BuildRequires: htmldoc ## when/if we ever decide to build and ship .jar's @@ -51,6 +56,7 @@ Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} Obsoletes: virtuoso-opensource-doc < %{version}-%{release} %endif +Requires: gawk %description Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML @@ -93,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} #patch51 -p1 -b .external_iodbc %patch100 -p0 -b .encoding +%patch101 -p0 -b .gawk4 %if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix @@ -203,6 +210,10 @@ rm -rf %{buildroot} %changelog +* Tue Oct 11 2011 Rex Dieter 6.1.3-3 +- gawk4 patch +- Requires: gawk + * Tue Oct 11 2011 Rex Dieter 6.1.3-2.1 - respin, enable 'make check' From 1fbff1b01679323b8e1a36d167e4a095f8b3c7fe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Oct 2011 15:34:21 -0500 Subject: [PATCH 18/50] drop Requires: gawk, add gawk4 bug reference --- virtuoso-opensource.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 2add880..1b109bf 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -56,8 +56,6 @@ Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} Obsoletes: virtuoso-opensource-doc < %{version}-%{release} %endif -Requires: gawk - %description Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform @@ -211,8 +209,7 @@ rm -rf %{buildroot} %changelog * Tue Oct 11 2011 Rex Dieter 6.1.3-3 -- gawk4 patch -- Requires: gawk +- gawk4 patch (#744189) * Tue Oct 11 2011 Rex Dieter 6.1.3-2.1 - respin, enable 'make check' From 207f5a0ae2471f6dd295fb96a1da6e6ab8016dba Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Oct 2011 19:26:49 -0500 Subject: [PATCH 19/50] disable 'make check' again (for now) --- virtuoso-opensource.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 1b109bf..c2ecdd2 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -163,7 +163,7 @@ rm -rvf %{buildroot}%{_libdir}/sesame %check ## these take a very long time -make check +#make check %clean From db3ceb228f9f676287c536a45ad8575ecc1c3593 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 1 Nov 2011 12:49:10 -0500 Subject: [PATCH 20/50] 6.1.4 --- .gitignore | 1 + sources | 2 +- virtuoso-opensource-6.1.3-encoding.patch | 21 --------------------- virtuoso-opensource-6.1.3-gawk4.patch | 22 ---------------------- virtuoso-opensource.spec | 22 ++++++++++------------ 5 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 virtuoso-opensource-6.1.3-encoding.patch delete mode 100644 virtuoso-opensource-6.1.3-gawk4.patch diff --git a/.gitignore b/.gitignore index 5ab4eec..7276054 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /virtuoso-opensource-6.1.2.tar.gz /virtuoso-opensource-6.1.3.tar.gz +/virtuoso-opensource-6.1.4.tar.gz diff --git a/sources b/sources index 092f81e..528e34a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d4b0497411ff1c34d7ca247618cdd17 virtuoso-opensource-6.1.3.tar.gz +7110a0b4b171b84850d346f4fe648172 virtuoso-opensource-6.1.4.tar.gz diff --git a/virtuoso-opensource-6.1.3-encoding.patch b/virtuoso-opensource-6.1.3-encoding.patch deleted file mode 100644 index 30046d2..0000000 --- a/virtuoso-opensource-6.1.3-encoding.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: libsrc/Wi/xqf.c -=================================================================== -RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v -retrieving revision 1.21.2.9 -retrieving revision 1.21.2.12 -diff -u -r1.21.2.9 -r1.21.2.12 ---- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 -+++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 -@@ -3520,6 +3552,12 @@ - desc = xqf_str_parser_descs + desc_idx; - if (DV_DB_NULL == arg_dtp) - return NEW_DB_NULL; -+ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ -+ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) -+ { -+ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); -+ goto res_ready; -+ } - if (DV_STRING != arg_dtp) - { - caddr_t err = NULL; diff --git a/virtuoso-opensource-6.1.3-gawk4.patch b/virtuoso-opensource-6.1.3-gawk4.patch deleted file mode 100644 index 5337fab..0000000 --- a/virtuoso-opensource-6.1.3-gawk4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u -r1.51.2.7 libsrc/Wisql_to_c.awk ---- libsrc/Wi/sql_to_c.aw 27 Oct 2010 12:31:21 -0000 1.51.2.7 -+++ libsrc/Wi/sql_to_c.awk 30 Aug 2011 14:30:58 -0000 -@@ -339,9 +339,17 @@ - if (length() < 2) - next - } -+ - # does escape the symbols - fun = $0 -- gsub ( /\\/, "\\\\", fun) -+ q = "\\\\" -+ if (PROCINFO["version"] ~ /^4/) -+ gsub ( q, q q, fun) -+ else -+ gsub ( q, q, fun) -+ -+ #WAS: gsub ( /\\/, "\\\\", fun) -+ - # remove whitespace except when there is just a semicolon - if ((in_xsl_mode == 0) && (in_xsd_mode == 0)) - { diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index c2ecdd2..8be3f94 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -4,8 +4,8 @@ Name: virtuoso-opensource Epoch: 1 -Version: 6.1.3 -Release: 3%{?dist} +Version: 6.1.4 +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -25,10 +25,6 @@ Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch ## Upstream patches -# nepomuk encoding error -# https://bugzilla.redhat.com/728857 -# http://bugs.kde.org/271664 -Patch100: virtuoso-opensource-6.1.3-encoding.patch # http://lwn.net/Articles/451578/ # https://sourceforge.net/tracker/?func=detail&aid=3358418&group_id=161622&atid=820574 # gawk4 compatibility @@ -42,10 +38,10 @@ BuildRequires: htmldoc ## when/if we ever decide to build and ship .jar's #BuildRequires: java-devel BuildRequires: openldap-devel -BuildRequires: openssl-devel -BuildRequires: libiodbc-devel -BuildRequires: libxml2-devel -BuildRequires: zlib-devel +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(libiodbc) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(zlib) Provides: virtuoso = %{version}-%{release} @@ -96,8 +92,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} #patch51 -p1 -b .external_iodbc -%patch100 -p0 -b .encoding -%patch101 -p0 -b .gawk4 %if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix @@ -173,6 +167,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS LICENSE +%doc README.UPGRADE %dir %{_sysconfdir}/virtuoso/ %config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini %{_bindir}/virtuoso-t @@ -208,6 +203,9 @@ rm -rf %{buildroot} %changelog +* Tue Nov 01 2011 Rex Dieter 6.1.4-1 +- 6.1.4 + * Tue Oct 11 2011 Rex Dieter 6.1.3-3 - gawk4 patch (#744189) From 4958451a1dd185bab9791f6a4f36e8e960441cda Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Nov 2011 13:31:48 -0500 Subject: [PATCH 21/50] drop old patch --- virtuoso-opensource.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 8be3f94..5119da2 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -25,10 +25,6 @@ Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch ## Upstream patches -# http://lwn.net/Articles/451578/ -# https://sourceforge.net/tracker/?func=detail&aid=3358418&group_id=161622&atid=820574 -# gawk4 compatibility -Patch101: virtuoso-opensource-6.1.3-gawk4.patch BuildRequires: bison BuildRequires: flex From ce9fd70bcde0e7b064f1f7e112420ca8ca6d216b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Nov 2011 14:02:09 -0500 Subject: [PATCH 22/50] disable-all-vads on ppc/ppc64 to workaround FTBFS (#725347) --- virtuoso-opensource.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 5119da2..d698e98 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -1,11 +1,15 @@ +# workaround vad creation fail on ppc, +# http://bugzilla.redhat.com/725347 +%ifarch ppc ppc64 # set to omit demos -#define _disable_all_vads --disable-all-vads +%define _disable_all_vads --disable-all-vads +%endif Name: virtuoso-opensource Epoch: 1 Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -199,6 +203,9 @@ rm -rf %{buildroot} %changelog +* Wed Nov 02 2011 Rex Dieter 6.1.4-2 +- --disable-all-vads on ppc/ppc64 to workaround FTBFS (#725347) + * Tue Nov 01 2011 Rex Dieter 6.1.4-1 - 6.1.4 From 81094b48717e62ac23cdbf1d51e71e317c7532a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:59:48 -0600 Subject: [PATCH 23/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d698e98..69b4960 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -203,6 +203,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1:6.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Nov 02 2011 Rex Dieter 6.1.4-2 - --disable-all-vads on ppc/ppc64 to workaround FTBFS (#725347) From 2a7acaf2ef30472ea647e76e0c32c29a6d1c4f5b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 18 Jan 2012 12:07:19 -0600 Subject: [PATCH 24/50] 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(-) create mode 100644 virtuoso-opensource-6.1.4-no_strip.patch 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 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 - 1:6.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 6d522d7a36305c9a4ce3d9ffd7c82705aff8fc26 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Mar 2012 10:16:16 -0500 Subject: [PATCH 25/50] 6.1.5 --- .gitignore | 3 +-- sources | 2 +- virtuoso-opensource.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7276054..da76e32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/virtuoso-opensource-6.1.2.tar.gz -/virtuoso-opensource-6.1.3.tar.gz /virtuoso-opensource-6.1.4.tar.gz +/virtuoso-opensource-6.1.5.tar.gz diff --git a/sources b/sources index 528e34a..d384fbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7110a0b4b171b84850d346f4fe648172 virtuoso-opensource-6.1.4.tar.gz +f81f1e31fbda93b0a408953309f2d1a5 virtuoso-opensource-6.1.5.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 8203e6f..e25ac2a 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -8,8 +8,8 @@ Name: virtuoso-opensource Epoch: 1 -Version: 6.1.4 -Release: 4%{?dist} +Version: 6.1.5 +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -28,6 +28,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 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 +Patch54: virtuoso-opensource-6.1.5-no_sparqlwords.patch ## Upstream patches @@ -98,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch52 -p1 -b .nodemos_buildfix %endif %patch53 -p1 -b .no_strip +%patch54 -p1 -b .no_sparqlwords # required by both patch52/53 ./autogen.sh @@ -106,7 +108,7 @@ find -name "*.jar" find -name "*.jar" -delete # hack in links for --with-odbc below -# not sure this is any better than our external_iodbc patch above +# not sure this is better than our external_iodbc patch above mkdir libiodbc pushd libiodbc ln -s %(pkg-config --variable includedir libiodbc) include @@ -122,6 +124,7 @@ popd --with-iodbc=`pwd`/libiodbc \ --enable-openssl \ --disable-imagemagick \ + --disable-wbxml2 \ %{?_disable_all_vads} make %{?_smp_mflags} @@ -211,6 +214,9 @@ rm -rf %{buildroot} %changelog +* Fri Mar 16 2012 Rex Dieter 1:6.1.5-1 +- 6.1.5 + * Wed Jan 18 2012 Rex Dieter 1:6.1.4-4 - make proper optimized build - -utils: include both normal and iodbc variants From 5c7ea19272650a1d357551e133669d72a475532a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Mar 2012 10:24:35 -0500 Subject: [PATCH 26/50] import awol no_sparqlwords.patch --- ...uoso-opensource-6.1.5-no_sparqlwords.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 virtuoso-opensource-6.1.5-no_sparqlwords.patch diff --git a/virtuoso-opensource-6.1.5-no_sparqlwords.patch b/virtuoso-opensource-6.1.5-no_sparqlwords.patch new file mode 100644 index 0000000..563a93c --- /dev/null +++ b/virtuoso-opensource-6.1.5-no_sparqlwords.patch @@ -0,0 +1,29 @@ +diff -up virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am.no_sparqlwords virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am +--- virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am.no_sparqlwords 2012-03-14 15:50:43.000000000 -0500 ++++ virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am 2012-03-16 10:23:27.335450699 -0500 +@@ -61,8 +61,7 @@ noinst_HEADERS = \ + wiservic.h wi_xid.h xmlenc_algos.h xmlenc.h xmlenc_test.h xmlgen.h \ + xml.h xmlnode.h xmlres.h xmltree.h xpath.h xpathp.h xpathp_impl.h \ + xpf.h xqf.h xslt_impl.h aqueue.h rdf_mapping_jso.h bitmap.h jso.h \ +- json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \ +- sparqlwords.h ++ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h + + + generated_code = \ +@@ -80,7 +79,6 @@ generated_code = \ + sparql_l.c \ + sparql_p.c \ + sparql_p.h \ +- sparqlwords.h \ + sql3.c \ + sql_code.c \ + sql_code_1.c \ +@@ -956,7 +954,6 @@ generated: \ + sparql_l.c \ + sparql_p.c \ + sparql_p.h \ +- sparqlwords.h \ + sql3.c \ + sql_code.c \ + sql_code_1.c \ From 451e12ca420a4f78e2978031694e3b65a3222dfd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Mar 2012 11:00:59 -0500 Subject: [PATCH 27/50] add dep to openssl binary (autogen.sh checks) --- virtuoso-opensource.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index e25ac2a..4a6fbe0 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -41,7 +41,7 @@ BuildRequires: htmldoc ## when/if we ever decide to build and ship .jar's #BuildRequires: java-devel BuildRequires: openldap-devel -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl) /usr/bin/openssl BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(zlib) From 0b93e40cafa4361a68750648da8d609c3c87bb56 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Mar 2012 11:12:59 -0500 Subject: [PATCH 28/50] safer workaround for awol sparqlwords.gperf --- ...uoso-opensource-6.1.5-no_sparqlwords.patch | 29 ------------------- virtuoso-opensource.spec | 8 +++-- 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 virtuoso-opensource-6.1.5-no_sparqlwords.patch diff --git a/virtuoso-opensource-6.1.5-no_sparqlwords.patch b/virtuoso-opensource-6.1.5-no_sparqlwords.patch deleted file mode 100644 index 563a93c..0000000 --- a/virtuoso-opensource-6.1.5-no_sparqlwords.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am.no_sparqlwords virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am ---- virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am.no_sparqlwords 2012-03-14 15:50:43.000000000 -0500 -+++ virtuoso-opensource-6.1.5/libsrc/Wi/Makefile.am 2012-03-16 10:23:27.335450699 -0500 -@@ -61,8 +61,7 @@ noinst_HEADERS = \ - wiservic.h wi_xid.h xmlenc_algos.h xmlenc.h xmlenc_test.h xmlgen.h \ - xml.h xmlnode.h xmlres.h xmltree.h xpath.h xpathp.h xpathp_impl.h \ - xpf.h xqf.h xslt_impl.h aqueue.h rdf_mapping_jso.h bitmap.h jso.h \ -- json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \ -- sparqlwords.h -+ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h - - - generated_code = \ -@@ -80,7 +79,6 @@ generated_code = \ - sparql_l.c \ - sparql_p.c \ - sparql_p.h \ -- sparqlwords.h \ - sql3.c \ - sql_code.c \ - sql_code_1.c \ -@@ -956,7 +954,6 @@ generated: \ - sparql_l.c \ - sparql_p.c \ - sparql_p.h \ -- sparqlwords.h \ - sql3.c \ - sql_code.c \ - sql_code_1.c \ diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 4a6fbe0..594bf7f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -28,7 +28,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 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 -Patch54: virtuoso-opensource-6.1.5-no_sparqlwords.patch ## Upstream patches @@ -99,7 +98,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch52 -p1 -b .nodemos_buildfix %endif %patch53 -p1 -b .no_strip -%patch54 -p1 -b .no_sparqlwords # required by both patch52/53 ./autogen.sh @@ -115,6 +113,12 @@ ln -s %(pkg-config --variable includedir libiodbc) include ln -s %(pkg-config --variable libdir libiodbc) lib popd +# workaround for missing sparqlwords.gperf +if [ ! -f libsrc/Wi/sparqlwords.gperf ]; then +touch libsrc/Wi/sparqlwords.gperf --reference libsrc/Wi/Makefile.am +touch libsrc/Wi/sparglwords.h +fi + %build %configure \ From 6d38d0d50f8b5213ea22c49f735ec8b950b83c91 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Mar 2012 11:59:10 -0500 Subject: [PATCH 29/50] tarball respin --- sources | 2 +- virtuoso-opensource.spec | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sources b/sources index d384fbd..dcac4df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f81f1e31fbda93b0a408953309f2d1a5 virtuoso-opensource-6.1.5.tar.gz +61b53395e14a11dd7e7715b50261b9eb virtuoso-opensource-6.1.5.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 594bf7f..263cfd3 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -113,12 +113,6 @@ ln -s %(pkg-config --variable includedir libiodbc) include ln -s %(pkg-config --variable libdir libiodbc) lib popd -# workaround for missing sparqlwords.gperf -if [ ! -f libsrc/Wi/sparqlwords.gperf ]; then -touch libsrc/Wi/sparqlwords.gperf --reference libsrc/Wi/Makefile.am -touch libsrc/Wi/sparglwords.h -fi - %build %configure \ @@ -218,6 +212,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 19 2012 Rex Dieter 1:6.1.5-2 +- tarball respin + * Fri Mar 16 2012 Rex Dieter 1:6.1.5-1 - 6.1.5 From c7d5346d74034b007cb6b73128b0f7e27b04835d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 Jul 2012 11:30:55 -0500 Subject: [PATCH 30/50] 1:6.1.5-3 - BR: net-tools - update URL --- virtuoso-opensource.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 263cfd3..cbb50cc 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,13 +9,14 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.5 -Release: 2%{?dist} +Release: 3%{?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/ +URL: http://virtuoso.openlinksw.com/wiki/main/ +#URL: https://github.com/openlink/virtuoso-opensource %if 0%{?snap:1} Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-6-%{snap}.tar.gz %else @@ -37,6 +38,8 @@ BuildRequires: flex BuildRequires: gawk BuildRequires: gperf BuildRequires: htmldoc +# for netstat +BuildRequires: net-tools ## when/if we ever decide to build and ship .jar's #BuildRequires: java-devel BuildRequires: openldap-devel @@ -212,6 +215,10 @@ rm -rf %{buildroot} %changelog +* Tue Jul 17 2012 Rex Dieter - 1:6.1.5-3 +- BR: net-tools +- update URL + * Mon Mar 19 2012 Rex Dieter 1:6.1.5-2 - tarball respin From e2130a78f8bab8ffa22632088b315ab5c97b060d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 Jul 2012 11:31:53 -0500 Subject: [PATCH 31/50] BR: readline-devel --- virtuoso-opensource.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index cbb50cc..35f8808 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -47,6 +47,7 @@ BuildRequires: pkgconfig(openssl) /usr/bin/openssl BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(zlib) +BuildRequires: readline-devel Provides: virtuoso = %{version}-%{release} @@ -216,7 +217,7 @@ rm -rf %{buildroot} %changelog * Tue Jul 17 2012 Rex Dieter - 1:6.1.5-3 -- BR: net-tools +- BR: net-tools readline-devel - update URL * Mon Mar 19 2012 Rex Dieter 1:6.1.5-2 From bb088097b52989a3182c42a36475a6779d8e3b16 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:52:16 -0500 Subject: [PATCH 32/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 35f8808..00656a4 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -216,6 +216,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1:6.1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 17 2012 Rex Dieter - 1:6.1.5-3 - BR: net-tools readline-devel - update URL From 00af2d57962f4ae6a4b91d2bae62dcf05fc53cc8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 13:51:34 -0500 Subject: [PATCH 33/50] 6.1.6-rc2 (20120724) snapshot --- virtuoso-opensource.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 00656a4..613a208 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -6,10 +6,12 @@ %define _disable_all_vads --disable-all-vads %endif +%define pre rc2 + Name: virtuoso-opensource Epoch: 1 -Version: 6.1.5 -Release: 4%{?dist} +Version: 6.1.6 +Release: 0.1.%{pre}%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -17,8 +19,8 @@ Group: Applications/Databases License: GPLv2 with exceptions URL: http://virtuoso.openlinksw.com/wiki/main/ #URL: https://github.com/openlink/virtuoso-opensource -%if 0%{?snap:1} -Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-6-%{snap}.tar.gz +%if 0%{?pre:1} +Source0: virtuoso-opensource-%{version}-%{pre}.tar.xz %else Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz %endif @@ -94,7 +96,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep -%setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} +%setup -q -n virtuoso-opensource-%{version} #patch51 -p1 -b .external_iodbc @@ -216,6 +218,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 24 2012 Rex Dieter - 1:6.1.6-0.1.rc2 +- 6.1.6-rc2 (20120724) snapshot + * Sun Jul 22 2012 Fedora Release Engineering - 1:6.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From ebe92c9e82ce2ee6eece2624b6d039a3058c3cd1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 13:51:53 -0500 Subject: [PATCH 34/50] new-sources too --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index da76e32..8fb9169 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /virtuoso-opensource-6.1.4.tar.gz /virtuoso-opensource-6.1.5.tar.gz +/virtuoso-opensource-6.1.6-rc2.tar.xz diff --git a/sources b/sources index dcac4df..32f1d5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61b53395e14a11dd7e7715b50261b9eb virtuoso-opensource-6.1.5.tar.gz +76db413df81bf01471c7d9bf0ed1e6f0 virtuoso-opensource-6.1.6-rc2.tar.xz From b8a7099c9c0e6532084ad2b21dfa21e5811df2c3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Aug 2012 09:24:42 -0500 Subject: [PATCH 35/50] 6.1.6 --- .gitignore | 4 +--- sources | 2 +- virtuoso-opensource.spec | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8fb9169..5485818 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/virtuoso-opensource-6.1.4.tar.gz -/virtuoso-opensource-6.1.5.tar.gz -/virtuoso-opensource-6.1.6-rc2.tar.xz +/virtuoso-opensource-6.1.6.tar.gz diff --git a/sources b/sources index 32f1d5d..92995b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76db413df81bf01471c7d9bf0ed1e6f0 virtuoso-opensource-6.1.6-rc2.tar.xz +3991149c570f3738c3e819ce603e487f virtuoso-opensource-6.1.6.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 613a208..d793cf4 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -6,12 +6,10 @@ %define _disable_all_vads --disable-all-vads %endif -%define pre rc2 - Name: virtuoso-opensource Epoch: 1 Version: 6.1.6 -Release: 0.1.%{pre}%{?dist} +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -218,6 +216,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 02 2012 Rex Dieter 1:6.1.6-1 +- 6.1.6 + * Tue Jul 24 2012 Rex Dieter - 1:6.1.6-0.1.rc2 - 6.1.6-rc2 (20120724) snapshot From 8522dd490ae36e31b01880824fe5de73d9546d0a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 17 Aug 2012 16:40:18 +0200 Subject: [PATCH 36/50] add fedora/rhel condition --- virtuoso-opensource.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d793cf4..7ae640f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -1,7 +1,7 @@ # workaround vad creation fail on ppc, # http://bugzilla.redhat.com/725347 -%ifarch ppc ppc64 +%if 0%{?rhel} # set to omit demos %define _disable_all_vads --disable-all-vads %endif @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -37,7 +37,9 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gawk BuildRequires: gperf +%if 0%{?fedora} BuildRequires: htmldoc +%endif # for netstat BuildRequires: net-tools ## when/if we ever decide to build and ship .jar's @@ -140,7 +142,9 @@ 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 -mkdir -p %{buildroot}%{_sysconfdir}/virtuoso +mkdir -p %{buildroot}%{_sysconfdir}/virtuoso \ + %{buildroot}%{_datadir}/virtuoso/vad \ + %{buildroot}%{_libdir}/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 @@ -216,6 +220,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 09 2012 Than Ngo - 1:6.1.6-2 +- add fedora/rhel condition + * Thu Aug 02 2012 Rex Dieter 1:6.1.6-1 - 6.1.6 From 6b3fd1029269ec9b3926690285b6ac9a9930eba3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:51:09 -0600 Subject: [PATCH 37/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 7ae640f..60a8778 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -220,6 +220,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1:6.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Aug 09 2012 Than Ngo - 1:6.1.6-2 - add fedora/rhel condition From f5a9c2479b49062b056907ed82ad45c3a7de77f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Tue, 28 May 2013 18:29:53 +0200 Subject: [PATCH 38/50] drop obsolete and unused (external iodbc) patch --- ...uoso-opensource-6.1.0-external_iodbc.patch | 21 ------------------- virtuoso-opensource.spec | 10 ++++----- 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 virtuoso-opensource-6.1.0-external_iodbc.patch diff --git a/virtuoso-opensource-6.1.0-external_iodbc.patch b/virtuoso-opensource-6.1.0-external_iodbc.patch deleted file mode 100644 index c3b3552..0000000 --- a/virtuoso-opensource-6.1.0-external_iodbc.patch +++ /dev/null @@ -1,21 +0,0 @@ -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" diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 60a8778..9f45ac7 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -25,8 +25,6 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -# 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 @@ -37,6 +35,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gawk BuildRequires: gperf +BuildRequires: pkgconfig %if 0%{?fedora} BuildRequires: htmldoc %endif @@ -98,8 +97,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n virtuoso-opensource-%{version} -#patch51 -p1 -b .external_iodbc - %if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix %endif @@ -220,6 +217,9 @@ rm -rf %{buildroot} %changelog +* Tue May 28 2013 Lukáš Tinkl - 1:6.1.6-4 +- drop obsolete and unused (external iodbc) patch + * Fri Feb 15 2013 Fedora Release Engineering - 1:6.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0256b68531d960bea204882c842477da82db070e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Jul 2013 13:42:07 -0500 Subject: [PATCH 39/50] 1:6.1.7-1 - 6.1.7 - .spec cleanup --- .gitignore | 1 + sources | 2 +- virtuoso-opensource-6.1.4-no_strip.patch | 14 ----------- virtuoso-opensource-6.1.7-no_strip.patch | 14 +++++++++++ ...so-opensource-6.1.7-nodemos_buildfix.patch | 16 ++++++------- virtuoso-opensource.spec | 24 +++++++------------ 6 files changed, 32 insertions(+), 39 deletions(-) delete mode 100644 virtuoso-opensource-6.1.4-no_strip.patch create mode 100644 virtuoso-opensource-6.1.7-no_strip.patch rename virtuoso-opensource-6.1.0-nodemos_buildfix.patch => virtuoso-opensource-6.1.7-nodemos_buildfix.patch (58%) diff --git a/.gitignore b/.gitignore index 5485818..10d8375 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /virtuoso-opensource-6.1.6.tar.gz +/virtuoso-opensource-6.1.7.tar.gz diff --git a/sources b/sources index 92995b4..7821f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3991149c570f3738c3e819ce603e487f virtuoso-opensource-6.1.6.tar.gz +f6429710b36c96657b9eac612190facf virtuoso-opensource-6.1.7.tar.gz diff --git a/virtuoso-opensource-6.1.4-no_strip.patch b/virtuoso-opensource-6.1.4-no_strip.patch deleted file mode 100644 index c48784f..0000000 --- a/virtuoso-opensource-6.1.4-no_strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-6.1.7-no_strip.patch b/virtuoso-opensource-6.1.7-no_strip.patch new file mode 100644 index 0000000..1592e61 --- /dev/null +++ b/virtuoso-opensource-6.1.7-no_strip.patch @@ -0,0 +1,14 @@ +diff -up virtuoso-opensource-6.1.7/configure.in.no_strip virtuoso-opensource-6.1.7/configure.in +--- virtuoso-opensource-6.1.7/configure.in.no_strip 2013-07-22 09:37:12.000000000 -0500 ++++ virtuoso-opensource-6.1.7/configure.in 2013-07-22 13:38:08.602089943 -0500 +@@ -649,8 +649,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-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.7-nodemos_buildfix.patch similarity index 58% rename from virtuoso-opensource-6.1.0-nodemos_buildfix.patch rename to virtuoso-opensource-6.1.7-nodemos_buildfix.patch index f6d2796..b016f55 100644 --- a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch +++ b/virtuoso-opensource-6.1.7-nodemos_buildfix.patch @@ -1,7 +1,7 @@ -diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -0600 -@@ -164,6 +164,7 @@ install-data-local: +diff -up virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am +--- virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2013-07-22 09:37:08.000000000 -0500 ++++ virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am 2013-07-22 13:38:08.598089985 -0500 +@@ -166,6 +166,7 @@ install-data-local: chmod +x install_ini.sh mkdir -p "$(DESTDIR)$(dbdir)" $(SHELL) install_ini.sh database @@ -9,7 +9,7 @@ diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_build if WITH_HTMLDOC mkdir -p "$(DESTDIR)$(htmldocdir)" $(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)" -@@ -173,6 +174,7 @@ if WITH_HTMLDOC +@@ -175,6 +176,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 @@ -17,9 +17,9 @@ diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_build uninstall-local: rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini" -diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 +diff -up virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am +--- virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am.nodemos_buildfix 2013-07-22 09:37:11.000000000 -0500 ++++ virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am 2013-07-22 13:38:08.599089975 -0500 @@ -24,6 +24,7 @@ #dist_httproot_DATA = *.html *.css *.txt diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 9f45ac7..03e330f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -8,11 +8,10 @@ Name: virtuoso-opensource Epoch: 1 -Version: 6.1.6 -Release: 4%{?dist} +Version: 6.1.7 +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.openlinksw.com/wiki/main/ @@ -25,8 +24,8 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch -Patch53: virtuoso-opensource-6.1.4-no_strip.patch +Patch52: virtuoso-opensource-6.1.7-nodemos_buildfix.patch +Patch53: virtuoso-opensource-6.1.7-no_strip.patch ## Upstream patches @@ -65,14 +64,12 @@ functionality. %package apps Summary: Applications -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description apps %{summary}. %package conductor Summary: Server pages -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description conductor @@ -80,7 +77,6 @@ BuildArch: noarch %package doc Summary: Documentation -Group: Documentation Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description doc @@ -88,7 +84,6 @@ BuildArch: noarch %package utils Summary: Utilities -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils %{summary}. @@ -97,9 +92,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n virtuoso-opensource-%{version} -%if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix -%endif %patch53 -p1 -b .no_strip # required by both patch52/53 @@ -179,7 +172,6 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS LICENSE %doc README.UPGRADE %dir %{_sysconfdir}/virtuoso/ @@ -195,28 +187,28 @@ rm -rf %{buildroot} %if ! 0%{?_disable_all_vads:1} %files apps -%defattr(-,root,root,-) %{_libdir}/virtuoso/hosting/ %{_datadir}/virtuoso/vad/*.vad %exclude %{_datadir}/virtuoso/vad/conductor_dav.vad %files conductor -%defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ %files doc -%defattr(-,root,root,-) %{_docdir}/virtuoso/ %endif %files utils -%defattr(-,root,root,-) %{_bindir}/*-vt %{_libexecdir}/virtuoso/* %changelog +* Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 +- 6.1.7 +- .spec cleanup + * Tue May 28 2013 Lukáš Tinkl - 1:6.1.6-4 - drop obsolete and unused (external iodbc) patch From cbe6566d686d6671e546f86b8ea4c17cb2721630 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:19:53 -0500 Subject: [PATCH 40/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 03e330f..b958e1f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -205,6 +205,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1:6.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 - 6.1.7 - .spec cleanup From 6cae71f11fc7695e4a858c598111f04302d7b217 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 4 Sep 2013 08:34:12 -0500 Subject: [PATCH 41/50] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild" This reverts commit cbe6566d686d6671e546f86b8ea4c17cb2721630. --- virtuoso-opensource.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index b958e1f..03e330f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 1 Version: 6.1.7 -Release: 2%{?dist} +Release: 1%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -205,9 +205,6 @@ rm -rf %{buildroot} %changelog -* Sun Aug 04 2013 Fedora Release Engineering - 1:6.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - * Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 - 6.1.7 - .spec cleanup From 06705c50b1d77ef46b690d86a497be93c59f5dd1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 4 Sep 2013 08:34:16 -0500 Subject: [PATCH 42/50] Revert "1:6.1.7-1" This reverts commit 0256b68531d960bea204882c842477da82db070e. --- .gitignore | 1 - sources | 2 +- ...so-opensource-6.1.0-nodemos_buildfix.patch | 16 ++++++------- virtuoso-opensource-6.1.4-no_strip.patch | 14 +++++++++++ virtuoso-opensource-6.1.7-no_strip.patch | 14 ----------- virtuoso-opensource.spec | 24 ++++++++++++------- 6 files changed, 39 insertions(+), 32 deletions(-) rename virtuoso-opensource-6.1.7-nodemos_buildfix.patch => virtuoso-opensource-6.1.0-nodemos_buildfix.patch (58%) create mode 100644 virtuoso-opensource-6.1.4-no_strip.patch delete mode 100644 virtuoso-opensource-6.1.7-no_strip.patch diff --git a/.gitignore b/.gitignore index 10d8375..5485818 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /virtuoso-opensource-6.1.6.tar.gz -/virtuoso-opensource-6.1.7.tar.gz diff --git a/sources b/sources index 7821f72..92995b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6429710b36c96657b9eac612190facf virtuoso-opensource-6.1.7.tar.gz +3991149c570f3738c3e819ce603e487f virtuoso-opensource-6.1.6.tar.gz diff --git a/virtuoso-opensource-6.1.7-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch similarity index 58% rename from virtuoso-opensource-6.1.7-nodemos_buildfix.patch rename to virtuoso-opensource-6.1.0-nodemos_buildfix.patch index b016f55..f6d2796 100644 --- a/virtuoso-opensource-6.1.7-nodemos_buildfix.patch +++ b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -1,7 +1,7 @@ -diff -up virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am ---- virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2013-07-22 09:37:08.000000000 -0500 -+++ virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am 2013-07-22 13:38:08.598089985 -0500 -@@ -166,6 +166,7 @@ install-data-local: +diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -0600 +@@ -164,6 +164,7 @@ install-data-local: chmod +x install_ini.sh mkdir -p "$(DESTDIR)$(dbdir)" $(SHELL) install_ini.sh database @@ -9,7 +9,7 @@ diff -up virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_build if WITH_HTMLDOC mkdir -p "$(DESTDIR)$(htmldocdir)" $(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)" -@@ -175,6 +176,7 @@ if WITH_HTMLDOC +@@ -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 @@ -17,9 +17,9 @@ diff -up virtuoso-opensource-6.1.7/binsrc/samples/demo/Makefile.am.nodemos_build uninstall-local: rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini" -diff -up virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am ---- virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am.nodemos_buildfix 2013-07-22 09:37:11.000000000 -0500 -+++ virtuoso-opensource-6.1.7/binsrc/vsp/Makefile.am 2013-07-22 13:38:08.599089975 -0500 +diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 @@ -24,6 +24,7 @@ #dist_httproot_DATA = *.html *.css *.txt 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-6.1.7-no_strip.patch b/virtuoso-opensource-6.1.7-no_strip.patch deleted file mode 100644 index 1592e61..0000000 --- a/virtuoso-opensource-6.1.7-no_strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up virtuoso-opensource-6.1.7/configure.in.no_strip virtuoso-opensource-6.1.7/configure.in ---- virtuoso-opensource-6.1.7/configure.in.no_strip 2013-07-22 09:37:12.000000000 -0500 -+++ virtuoso-opensource-6.1.7/configure.in 2013-07-22 13:38:08.602089943 -0500 -@@ -649,8 +649,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 03e330f..9f45ac7 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -8,10 +8,11 @@ Name: virtuoso-opensource Epoch: 1 -Version: 6.1.7 -Release: 1%{?dist} +Version: 6.1.6 +Release: 4%{?dist} Summary: A high-performance object-relational SQL database +Group: Applications/Databases # see LICENSE for exception details License: GPLv2 with exceptions URL: http://virtuoso.openlinksw.com/wiki/main/ @@ -24,8 +25,8 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -Patch52: virtuoso-opensource-6.1.7-nodemos_buildfix.patch -Patch53: virtuoso-opensource-6.1.7-no_strip.patch +Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch +Patch53: virtuoso-opensource-6.1.4-no_strip.patch ## Upstream patches @@ -64,12 +65,14 @@ functionality. %package apps Summary: Applications +Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description apps %{summary}. %package conductor Summary: Server pages +Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description conductor @@ -77,6 +80,7 @@ BuildArch: noarch %package doc Summary: Documentation +Group: Documentation Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description doc @@ -84,6 +88,7 @@ BuildArch: noarch %package utils Summary: Utilities +Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils %{summary}. @@ -92,7 +97,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n virtuoso-opensource-%{version} +%if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix +%endif %patch53 -p1 -b .no_strip # required by both patch52/53 @@ -172,6 +179,7 @@ rm -rf %{buildroot} %files +%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS LICENSE %doc README.UPGRADE %dir %{_sysconfdir}/virtuoso/ @@ -187,28 +195,28 @@ rm -rf %{buildroot} %if ! 0%{?_disable_all_vads:1} %files apps +%defattr(-,root,root,-) %{_libdir}/virtuoso/hosting/ %{_datadir}/virtuoso/vad/*.vad %exclude %{_datadir}/virtuoso/vad/conductor_dav.vad %files conductor +%defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ %files doc +%defattr(-,root,root,-) %{_docdir}/virtuoso/ %endif %files utils +%defattr(-,root,root,-) %{_bindir}/*-vt %{_libexecdir}/virtuoso/* %changelog -* Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 -- 6.1.7 -- .spec cleanup - * Tue May 28 2013 Lukáš Tinkl - 1:6.1.6-4 - drop obsolete and unused (external iodbc) patch From beef21cf1357a2072f32754670e0a57457e2dc49 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 4 Sep 2013 08:39:11 -0500 Subject: [PATCH 43/50] revert to 6.1.6 (avoid 6.1.7 regressions), epoch++ --- virtuoso-opensource.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 9f45ac7..58c2a0e 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,12 +7,11 @@ %endif Name: virtuoso-opensource -Epoch: 1 +Epoch: 2 Version: 6.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-performance object-relational SQL database -Group: Applications/Databases # see LICENSE for exception details License: GPLv2 with exceptions URL: http://virtuoso.openlinksw.com/wiki/main/ @@ -65,14 +64,12 @@ functionality. %package apps Summary: Applications -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description apps %{summary}. %package conductor Summary: Server pages -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description conductor @@ -80,7 +77,6 @@ BuildArch: noarch %package doc Summary: Documentation -Group: Documentation Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description doc @@ -88,7 +84,6 @@ BuildArch: noarch %package utils Summary: Utilities -Group: Applications/Databases Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils %{summary}. @@ -179,7 +174,6 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS LICENSE %doc README.UPGRADE %dir %{_sysconfdir}/virtuoso/ @@ -195,28 +189,34 @@ rm -rf %{buildroot} %if ! 0%{?_disable_all_vads:1} %files apps -%defattr(-,root,root,-) %{_libdir}/virtuoso/hosting/ %{_datadir}/virtuoso/vad/*.vad %exclude %{_datadir}/virtuoso/vad/conductor_dav.vad %files conductor -%defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ %files doc -%defattr(-,root,root,-) %{_docdir}/virtuoso/ %endif %files utils -%defattr(-,root,root,-) %{_bindir}/*-vt %{_libexecdir}/virtuoso/* %changelog +* Wed Sep 04 2013 Rex Dieter 2:6.1.6-5 +- revert to 6.1.6 (avoid 6.1.7 regressions), epoch++ + +* Sun Aug 04 2013 Fedora Release Engineering - 1:6.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 +- 6.1.7 +- .spec cleanup + * Tue May 28 2013 Lukáš Tinkl - 1:6.1.6-4 - drop obsolete and unused (external iodbc) patch From 6007bc46dca1440945d47069d7b64c5f9aa25997 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:50:47 -0500 Subject: [PATCH 44/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 58c2a0e..12911f5 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -207,6 +207,9 @@ rm -rf %{buildroot} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2:6.1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Sep 04 2013 Rex Dieter 2:6.1.6-5 - revert to 6.1.6 (avoid 6.1.7 regressions), epoch++ From 5f51ce1d480429cea80ef9521c9924b3942b5c7f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:00:00 +0000 Subject: [PATCH 45/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 12911f5..6df5c9f 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -207,6 +207,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2:6.1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2:6.1.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 9d3947bc8afb811e5813f2df601b7567f9318639 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:04:51 +0000 Subject: [PATCH 46/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 6df5c9f..ef00b6b 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -207,6 +207,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2:6.1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 2:6.1.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From e4cd4a1a02aeabb75828f94ffd19894d87e854b2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 25 Jun 2015 09:36:09 -0500 Subject: [PATCH 47/50] Provides: virtuoso6 ... --- virtuoso-opensource.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index ef00b6b..6a55c9a 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -50,6 +50,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: readline-devel Provides: virtuoso = %{version}-%{release} +Provides: virtuoso6 = %{version}-%{release} %if 0%{?_disable_all_vads:1} Obsoletes: virtuoso-opensource-apps < %{version}-%{release} @@ -207,6 +208,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 25 2015 Rex Dieter 2:6.1.6-9 +- Provides: virtuoso6 ... + * Fri Jun 19 2015 Fedora Release Engineering - 2:6.1.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 73446d903d1fd367dc3381689a24a2a69fb90cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sat, 2 Jan 2016 15:43:21 -0500 Subject: [PATCH 48/50] - fix build on s390(x) with recent kernels --- virtuoso-opensource-6.1.6-types.patch | 42 +++++++++++++++++++++++++++ virtuoso-opensource.spec | 9 +++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 virtuoso-opensource-6.1.6-types.patch diff --git a/virtuoso-opensource-6.1.6-types.patch b/virtuoso-opensource-6.1.6-types.patch new file mode 100644 index 0000000..e4425e4 --- /dev/null +++ b/virtuoso-opensource-6.1.6-types.patch @@ -0,0 +1,42 @@ +diff -up virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c.types virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c +--- virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c.types 2016-01-02 12:43:55.539956990 -0500 ++++ virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c 2016-01-02 12:45:15.809956990 -0500 +@@ -587,7 +587,7 @@ tcpses_accept (session_t * ses, session_ + { + int rc; + int new_socket; +- socklen_t addrlen = sizeof (saddr_t); ++ socklen_t addrlen = sizeof (skaddr_t); + + dbg_printf_1 (("tcpses_accept.")); + +@@ -2481,7 +2481,7 @@ unixses_listen (session_t * ses) + return (SER_CNTRL); + } + +- if ((rc = bind (s, (saddr_t *) p_addr, sizeof (saddrun_t))) < 0) ++ if ((rc = bind (s, (skaddr_t *) p_addr, sizeof (saddrun_t))) < 0) + { + + test_eintr (ses, rc, errno); +diff -up virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h.types virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h +--- virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h.types 2016-01-02 12:43:34.929956990 -0500 ++++ virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h 2016-01-02 12:44:44.539956990 -0500 +@@ -42,7 +42,7 @@ + + + typedef struct sockaddr_in saddrin_t; +-typedef struct sockaddr saddr_t; ++typedef struct sockaddr skaddr_t; + #ifdef COM_UNIXSOCK + typedef struct sockaddr_un saddrun_t; + #endif +@@ -53,7 +53,7 @@ typedef union + #ifdef COM_UNIXSOCK + saddrun_t u; + #endif +- saddr_t a; ++ skaddr_t a; + } usaddr_t; + #define TCP_HOSTNAMELEN 100 /* Something */ + diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 6a55c9a..09de338 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -26,6 +26,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch Patch53: virtuoso-opensource-6.1.4-no_strip.patch +# workaround conflict with system addr_r/saddr_t type on s390(x) +# /usr/include/asm/types.h:18:25: note: previous declaration of 'saddr_t' was here +Patch54: virtuoso-opensource-6.1.6-types.patch ## Upstream patches @@ -97,6 +100,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch52 -p1 -b .nodemos_buildfix %endif %patch53 -p1 -b .no_strip +%patch54 -p1 -b .types # required by both patch52/53 ./autogen.sh @@ -208,6 +212,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 02 2016 Dan Horák - 2:6.1.6-10 +- fix build on s390(x) with recent kernels + * Thu Jun 25 2015 Rex Dieter 2:6.1.6-9 - Provides: virtuoso6 ... From dc42e9d3f4f34482e00a80ddac402ea35f6b75df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:47:02 +0000 Subject: [PATCH 49/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- virtuoso-opensource.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 09de338..ffafdb0 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -9,7 +9,7 @@ Name: virtuoso-opensource Epoch: 2 Version: 6.1.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A high-performance object-relational SQL database # see LICENSE for exception details @@ -212,6 +212,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2:6.1.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 02 2016 Dan Horák - 2:6.1.6-10 - fix build on s390(x) with recent kernels From a5a13fa72220ee791fc2eaff44465702ee15328c Mon Sep 17 00:00:00 2001 From: Till Maas Date: Thu, 19 May 2016 22:51:11 +0200 Subject: [PATCH 50/50] 2016-05-19: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - dead.package | 3 + sources | 1 - ...so-opensource-6.1.0-nodemos_buildfix.patch | 38 -- virtuoso-opensource-6.1.4-no_strip.patch | 14 - virtuoso-opensource-6.1.6-types.patch | 42 --- virtuoso-opensource.spec | 348 ------------------ 7 files changed, 3 insertions(+), 444 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 virtuoso-opensource-6.1.0-nodemos_buildfix.patch delete mode 100644 virtuoso-opensource-6.1.4-no_strip.patch delete mode 100644 virtuoso-opensource-6.1.6-types.patch delete mode 100644 virtuoso-opensource.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5485818..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/virtuoso-opensource-6.1.6.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index 92995b4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3991149c570f3738c3e819ce603e487f virtuoso-opensource-6.1.6.tar.gz diff --git a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch deleted file mode 100644 index f6d2796..0000000 --- a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -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" -diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 -@@ -24,6 +24,7 @@ - #dist_httproot_DATA = *.html *.css *.txt - - install-data-local: -+if WITH_DEMO_VAD - @echo Installing in "$(httprootdir)" - mkdir -p "$(DESTDIR)$(httprootdir)" - mkdir -p "$(DESTDIR)$(httprootdir)"/images -@@ -37,6 +38,7 @@ install-data-local: - $(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images - $(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images - $(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx -+endif - - - uninstall-local: diff --git a/virtuoso-opensource-6.1.4-no_strip.patch b/virtuoso-opensource-6.1.4-no_strip.patch deleted file mode 100644 index c48784f..0000000 --- a/virtuoso-opensource-6.1.4-no_strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-6.1.6-types.patch b/virtuoso-opensource-6.1.6-types.patch deleted file mode 100644 index e4425e4..0000000 --- a/virtuoso-opensource-6.1.6-types.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c.types virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c ---- virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c.types 2016-01-02 12:43:55.539956990 -0500 -+++ virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcp.c 2016-01-02 12:45:15.809956990 -0500 -@@ -587,7 +587,7 @@ tcpses_accept (session_t * ses, session_ - { - int rc; - int new_socket; -- socklen_t addrlen = sizeof (saddr_t); -+ socklen_t addrlen = sizeof (skaddr_t); - - dbg_printf_1 (("tcpses_accept.")); - -@@ -2481,7 +2481,7 @@ unixses_listen (session_t * ses) - return (SER_CNTRL); - } - -- if ((rc = bind (s, (saddr_t *) p_addr, sizeof (saddrun_t))) < 0) -+ if ((rc = bind (s, (skaddr_t *) p_addr, sizeof (saddrun_t))) < 0) - { - - test_eintr (ses, rc, errno); -diff -up virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h.types virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h ---- virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h.types 2016-01-02 12:43:34.929956990 -0500 -+++ virtuoso-opensource-6.1.6/libsrc/Dk/Dksestcpint.h 2016-01-02 12:44:44.539956990 -0500 -@@ -42,7 +42,7 @@ - - - typedef struct sockaddr_in saddrin_t; --typedef struct sockaddr saddr_t; -+typedef struct sockaddr skaddr_t; - #ifdef COM_UNIXSOCK - typedef struct sockaddr_un saddrun_t; - #endif -@@ -53,7 +53,7 @@ typedef union - #ifdef COM_UNIXSOCK - saddrun_t u; - #endif -- saddr_t a; -+ skaddr_t a; - } usaddr_t; - #define TCP_HOSTNAMELEN 100 /* Something */ - diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec deleted file mode 100644 index ffafdb0..0000000 --- a/virtuoso-opensource.spec +++ /dev/null @@ -1,348 +0,0 @@ - -# workaround vad creation fail on ppc, -# http://bugzilla.redhat.com/725347 -%if 0%{?rhel} -# set to omit demos -%define _disable_all_vads --disable-all-vads -%endif - -Name: virtuoso-opensource -Epoch: 2 -Version: 6.1.6 -Release: 11%{?dist} -Summary: A high-performance object-relational SQL database - -# see LICENSE for exception details -License: GPLv2 with exceptions -URL: http://virtuoso.openlinksw.com/wiki/main/ -#URL: https://github.com/openlink/virtuoso-opensource -%if 0%{?pre:1} -Source0: virtuoso-opensource-%{version}-%{pre}.tar.xz -%else -Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz -%endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -## Upstreamable patches -Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch -Patch53: virtuoso-opensource-6.1.4-no_strip.patch -# workaround conflict with system addr_r/saddr_t type on s390(x) -# /usr/include/asm/types.h:18:25: note: previous declaration of 'saddr_t' was here -Patch54: virtuoso-opensource-6.1.6-types.patch - -## Upstream patches - -BuildRequires: automake libtool -BuildRequires: bison -BuildRequires: flex -BuildRequires: gawk -BuildRequires: gperf -BuildRequires: pkgconfig -%if 0%{?fedora} -BuildRequires: htmldoc -%endif -# for netstat -BuildRequires: net-tools -## when/if we ever decide to build and ship .jar's -#BuildRequires: java-devel -BuildRequires: openldap-devel -BuildRequires: pkgconfig(openssl) /usr/bin/openssl -BuildRequires: pkgconfig(libiodbc) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(zlib) -BuildRequires: readline-devel - -Provides: virtuoso = %{version}-%{release} -Provides: virtuoso6 = %{version}-%{release} - -%if 0%{?_disable_all_vads:1} -Obsoletes: virtuoso-opensource-apps < %{version}-%{release} -Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} -Obsoletes: virtuoso-opensource-doc < %{version}-%{release} -%endif - -%description -Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML -Data Management with Web Application Server and Web Services Platform -functionality. - -%package apps -Summary: Applications -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%description apps -%{summary}. - -%package conductor -Summary: Server pages -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -BuildArch: noarch -%description conductor -%{summary}. - -%package doc -Summary: Documentation -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -BuildArch: noarch -%description doc -%{summary}. - -%package utils -Summary: Utilities -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%description utils -%{summary}. - - -%prep -%setup -q -n virtuoso-opensource-%{version} - -%if 0%{?_disable_all_vads:1} -%patch52 -p1 -b .nodemos_buildfix -%endif -%patch53 -p1 -b .no_strip -%patch54 -p1 -b .types - -# required by both patch52/53 -./autogen.sh - -find -name "*.jar" -find -name "*.jar" -delete - -# hack in links for --with-odbc below -# not sure this is better than our external_iodbc patch above -mkdir libiodbc -pushd libiodbc -ln -s %(pkg-config --variable includedir libiodbc) include -ln -s %(pkg-config --variable libdir libiodbc) lib -popd - - -%build -%configure \ - --with-layout=redhat \ - --enable-shared --disable-static \ - --without-internal-zlib \ - --with-iodbc=`pwd`/libiodbc \ - --enable-openssl \ - --disable-imagemagick \ - --disable-wbxml2 \ - %{?_disable_all_vads} - -make %{?_smp_mflags} - - -%install -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 - -mkdir -p %{buildroot}%{_sysconfdir}/virtuoso \ - %{buildroot}%{_datadir}/virtuoso/vad \ - %{buildroot}%{_libdir}/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 -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} -rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la -%if 0%{?_disable_all_vads:1} -rm -rvf %{buildroot}%{_docdir}/virtuoso/ -rm -vf %{buildroot}%{_libdir}/{hibernate,jdbc-?.?,jena}/*.jar -%endif -rm -rvf %{buildroot}%{_libdir}/sesame - - -%check -## these take a very long time -%{?_with_check:make check} - - -%clean -rm -rf %{buildroot} - - -%files -%doc AUTHORS ChangeLog COPYING CREDITS LICENSE -%doc README.UPGRADE -%dir %{_sysconfdir}/virtuoso/ -%config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini -%{_bindir}/virtuoso-t -%{_libdir}/virt*.so -%dir %{_datadir}/virtuoso/ -%dir %{_datadir}/virtuoso/vad/ -%dir %{_libdir}/virtuoso/ -%dir %{_libexecdir}/virtuoso/ -%dir %{_var}/lib/virtuoso -%{_var}/lib/virtuoso/db/ - -%if ! 0%{?_disable_all_vads:1} -%files apps -%{_libdir}/virtuoso/hosting/ -%{_datadir}/virtuoso/vad/*.vad -%exclude %{_datadir}/virtuoso/vad/conductor_dav.vad - -%files conductor -%{_datadir}/virtuoso/vad/conductor_dav.vad -%{_var}/lib/virtuoso/vsp/ - -%files doc -%{_docdir}/virtuoso/ -%endif - -%files utils -%{_bindir}/*-vt -%{_libexecdir}/virtuoso/* - - -%changelog -* Fri Feb 05 2016 Fedora Release Engineering - 2:6.1.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 02 2016 Dan Horák - 2:6.1.6-10 -- fix build on s390(x) with recent kernels - -* Thu Jun 25 2015 Rex Dieter 2:6.1.6-9 -- Provides: virtuoso6 ... - -* Fri Jun 19 2015 Fedora Release Engineering - 2:6.1.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2:6.1.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2:6.1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Sep 04 2013 Rex Dieter 2:6.1.6-5 -- revert to 6.1.6 (avoid 6.1.7 regressions), epoch++ - -* Sun Aug 04 2013 Fedora Release Engineering - 1:6.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 22 2013 Rex Dieter - 1:6.1.7-1 -- 6.1.7 -- .spec cleanup - -* Tue May 28 2013 Lukáš Tinkl - 1:6.1.6-4 -- drop obsolete and unused (external iodbc) patch - -* Fri Feb 15 2013 Fedora Release Engineering - 1:6.1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 09 2012 Than Ngo - 1:6.1.6-2 -- add fedora/rhel condition - -* Thu Aug 02 2012 Rex Dieter 1:6.1.6-1 -- 6.1.6 - -* Tue Jul 24 2012 Rex Dieter - 1:6.1.6-0.1.rc2 -- 6.1.6-rc2 (20120724) snapshot - -* Sun Jul 22 2012 Fedora Release Engineering - 1:6.1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 17 2012 Rex Dieter - 1:6.1.5-3 -- BR: net-tools readline-devel -- update URL - -* Mon Mar 19 2012 Rex Dieter 1:6.1.5-2 -- tarball respin - -* Fri Mar 16 2012 Rex Dieter 1:6.1.5-1 -- 6.1.5 - -* Wed Jan 18 2012 Rex Dieter 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 - 1:6.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 02 2011 Rex Dieter 6.1.4-2 -- --disable-all-vads on ppc/ppc64 to workaround FTBFS (#725347) - -* Tue Nov 01 2011 Rex Dieter 6.1.4-1 -- 6.1.4 - -* Tue Oct 11 2011 Rex Dieter 6.1.3-3 -- gawk4 patch (#744189) - -* Tue Oct 11 2011 Rex Dieter 6.1.3-2.1 -- respin, enable 'make check' - -* Wed Sep 14 2011 Rex Dieter 6.1.3-2 -- upstream patch to fix encoding errors (#728857, kde#271664) - -* Fri Jul 08 2011 Rex Dieter 6.1.3-1 -- 6.1.3 (final) -- epoch++ (to allow upgrade from f15's 1:6.1.2-3) - -* Mon Feb 07 2011 Fedora Release Engineering - 6.1.3-0.3.rc3.20110105 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 13 2011 Rex Dieter 6.1.3-0.2.rc3.20110105 -- don't autogen.sh things by default - -* Thu Jan 06 2011 Rex Dieter 6.1.3-0.1.rc3.20110105 -- virtuoso-opensource-6-20110105 snapshot - -* Thu Oct 21 2010 Pierre-Yves Chibon 6.1.2-2 -- Enable creation subpackage -conductor -- Remove all .jar from sources before building - -* Wed Jul 21 2010 Rex Dieter 6.1.2-1 -- virtuoso-opensource-6.1.2 - -* Mon May 10 2010 Rex Dieter 6.1.1-1 -- virtuoso-opensource-6.1.1 -- Obsoletes: -doc - -* Tue Feb 09 2010 Rex Dieter 6.1.0-2 -- fix Obsoletes: -apps,-conductor - -* Thu Feb 04 2010 Rex Dieter 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 6.0.0-1 -- virtuoso-opensource-6.0.0 - -* Tue Oct 20 2009 Rex Dieter 5.0.12-1 -- virtuoso-opensource-5.0.12 - -* Sun Oct 11 2009 Rex Dieter 5.0.12-0.1.rc9.20090916 -- virtuoso-opensource-20090916 (5.0.12-rc9) - -* Wed Aug 26 2009 Tomas Mraz - 5.0.11-4 -- rebuilt with new openssl - -* Fri Jul 24 2009 Rex Dieter 5.0.11-3 -- BR: htmldoc -- -doc subpkg - -* Sun Jun 07 2009 Rex Dieter 5.0.11-2 -- omit remaining .la files -- fix %%changelog -- fix virtuoso.ini dangling symlink - -* Fri May 22 2009 Rex Dieter 5.0.11-1 -- virtuoso-opensource-5.0.11 -