Merge branch 'master' into f14

Conflicts:
	virtuoso-opensource.spec

.gitignore

@@ -0,0 +1,3 @@
+/virtuoso-opensource-6.1.2.tar.gz
+/virtuoso-opensource-6.1.3.tar.gz
+/virtuoso-opensource-6.1.4.tar.gz

dead.package

@@ -1,3 +0,0 @@
-2016-05-19: Retired orphaned package, because it was orphaned for
-more than six weeks.
-

sources

@@ -0,0 +1 @@
+7110a0b4b171b84850d346f4fe648172  virtuoso-opensource-6.1.4.tar.gz

virtuoso-opensource-6.1.0-external_iodbc.patch

@@ -0,0 +1,21 @@
+diff -up virtuoso-opensource-6.1.0/configure.in.external_iodbc virtuoso-opensource-6.1.0/configure.in
+--- virtuoso-opensource-6.1.0/configure.in.external_iodbc	2010-02-03 14:49:18.000000000 -0600
++++ virtuoso-opensource-6.1.0/configure.in	2010-02-04 08:16:51.265605024 -0600
+@@ -1833,7 +1833,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if usin
+ #
+ if test "x$virt_do_iodbc" = "xyes"
+ then
+-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
++    iodbc_CPPFLAGS=`pkg-config --cflags libiodbc`
+ 
+     saved_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
+@@ -1842,7 +1842,7 @@ then
+ 
+     ccincl="$iodbc_CPPFLAGS $ccincl"
+ 
+-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
++    iodbc_LDFLAGS=`pkg-config --libs libiodbc`
+     AC_CHECK_LIB(iodbc, SQLTables,
+ 		 [
+ 		  virt_do_iodbc="yes"

virtuoso-opensource-6.1.0-nodemos_buildfix.patch

@@ -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:

virtuoso-opensource.spec

@@ -0,0 +1,275 @@
+
+# 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
+%endif
+
+Name:    virtuoso-opensource
+Epoch:   1
+Version: 6.1.4
+Release: 2%{?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/
+%if 0%{?snap:1}
+Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-6-%{snap}.tar.gz
+%else
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+%endif
+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
+
+## Upstream patches
+
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gawk
+BuildRequires: gperf
+BuildRequires: htmldoc
+## when/if we ever decide to build and ship .jar's
+#BuildRequires: java-devel
+BuildRequires: openldap-devel
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(libiodbc)
+BuildRequires: pkgconfig(libxml-2.0)
+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} 
+%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
+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 
+%{summary}.
+
+%package doc 
+Summary: Documentation 
+Group:   Documentation 
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+BuildArch: noarch
+%description doc 
+%{summary}.
+
+%package utils
+Summary: Utilities
+Group:   Applications/Databases
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description utils
+%{summary}.
+
+
+%prep
+%setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}}
+
+#patch51 -p1 -b .external_iodbc
+
+%if 0%{?_disable_all_vads:1}
+%patch52 -p1 -b .nodemos_buildfix
+./autogen.sh
+%endif
+
+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
+mkdir libiodbc
+pushd libiodbc
+ln -s %(pkg-config --variable includedir libiodbc) include
+ln -s %(pkg-config --variable libdir libiodbc) lib
+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 \
+  %{?_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
+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/
+
+## 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
+#make check
+
+
+%clean
+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
+%{_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
+%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}/virt_mail
+%{_libexecdir}/virtuoso/*
+
+
+%changelog
+* Wed Nov 02 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.4-2
+- --disable-all-vads on ppc/ppc64 to workaround FTBFS (#725347)
+
+* Tue Nov 01 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.4-1
+- 6.1.4
+
+* Tue Oct 11 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-3
+- gawk4 patch (#744189)
+
+* Tue Oct 11 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-2.1
+- respin, enable 'make check'
+
+* Wed Sep 14 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-2
+- upstream patch to fix encoding errors (#728857, kde#271664)
+
+* Fri Jul 08 2011 Rex Dieter <rdieter@fedoraproject.org> 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 <rel-eng@lists.fedoraproject.org> - 6.1.3-0.3.rc3.20110105
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan 13 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-0.2.rc3.20110105
+- don't autogen.sh things by default
+
+* Thu Jan 06 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-0.1.rc3.20110105
+- virtuoso-opensource-6-20110105 snapshot
+
+* Thu Oct 21 2010 Pierre-Yves Chibon <pingou@pingoured.fr> 6.1.2-2
+- Enable creation subpackage -conductor
+- Remove all .jar from sources before building
+
+* Wed Jul 21 2010 Rex Dieter <rdieter@fedoraproject.org> 6.1.2-1
+- virtuoso-opensource-6.1.2
+
+* Mon May 10 2010 Rex Dieter <rdieter@fedoraproject.org> 6.1.1-1
+- virtuoso-opensource-6.1.1
+- Obsoletes: -doc
+
+* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> 6.1.0-2
+- fix Obsoletes: -apps,-conductor
+
+* Thu Feb 04 2010 Rex Dieter <rdieter@fedoraproject.org> 6.1.0-1
+- virtuoso-opensource-6.1.0
+- build only what we need for nepomuk, Obsoletes: -apps,-conductor
+
+* Sat Jan 09 2010 Rex Dieter <rdieter@fedoraproject.org> 6.0.0-1
+- virtuoso-opensource-6.0.0
+
+* Tue Oct 20 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter@fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 5.0.11-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-3
+- BR: htmldoc
+- -doc subpkg
+
+* Sun Jun 07 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-2
+- omit remaining .la files
+- fix %%changelog
+- fix virtuoso.ini dangling symlink
+
+* Fri May 22 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-1
+- virtuoso-opensource-5.0.11
+