rpms/virtuoso-opensource/devel virtuoso-opensource-6.1.0-nodemos_buildfix.patch, 1.1, 1.2 virtuoso-opensource.spec, 1.10, 1.11

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15872

Modified Files:
	virtuoso-opensource-6.1.0-nodemos_buildfix.patch 
	virtuoso-opensource.spec 
Log Message:
one more round of buildfixes


virtuoso-opensource-6.1.0-nodemos_buildfix.patch:
 samples/demo/Makefile.am |    2 ++
 vsp/Makefile.am          |    2 ++
 2 files changed, 4 insertions(+)

Index: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource-6.1.0-nodemos_buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource-6.1.0-nodemos_buildfix.patch	4 Feb 2010 17:49:25 -0000	1.1
+++ virtuoso-opensource-6.1.0-nodemos_buildfix.patch	4 Feb 2010 18:04:28 -0000	1.2
@@ -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/binsr
  
  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:


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- virtuoso-opensource.spec	4 Feb 2010 17:49:58 -0000	1.10
+++ virtuoso-opensource.spec	4 Feb 2010 18:04:28 -0000	1.11
@@ -39,7 +39,7 @@ Provides: virtuoso = %{version}-%{releas
 
 %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