diff --git a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch index a39549d..f6d2796 100644 --- a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch +++ b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -1,6 +1,6 @@ -diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.buildfix 2009-08-31 03:08:47.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 10:08:16.763606447 -0600 +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)" @@ -17,3 +17,22 @@ diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.buildfix virt 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 ccf2a52..d59b588 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -39,7 +39,7 @@ Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} Obsoletes: virtuoso-apps < 6.1.0 -Obsoletes: virtuoso-conductor < 6.1.0 +Obsoletes: virtuoso-conductor < 6.1.0 %endif