[virtuoso-opensource] Revert "1:6.1.7-1"

Wed Sep 4 13:39:25 UTC 2013

commit 06705c50b1d77ef46b690d86a497be93c59f5dd1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 08:34:16 2013 -0500

    Revert "1:6.1.7-1"
    
    This reverts commit 0256b68531d960bea204882c842477da82db070e.

 .gitignore                                         |    1 -
 sources                                            |    2 +-
 ...irtuoso-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(-)
---

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.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 <rdieter at fedoraproject.org> - 1:6.1.7-1
-- 6.1.7
-- .spec cleanup
-
 * Tue May 28 2013 Lukáš Tinkl <ltinkl at redhat.com> - 1:6.1.6-4
 - drop obsolete and unused (external iodbc) patch
 
