[Spice-devel] [spice-html5 4/7] No longer install apache.conf, just put it in the doc folder.

[Jeremy White]

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 Makefile            |    2 --
 apache.conf         |   10 ----------
 apache.conf.sample  |   10 ++++++++++
 spice-html5.spec.in |    4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 apache.conf
 create mode 100644 apache.conf.sample

diff --git a/Makefile b/Makefile
index 0f98ff8..add307f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@
 
 DESTDIR := $(if $(DESTDIR),$(DESTDIR),/)
 datadir := $(if $(datadir),$(datadir),$(DESTDIR)/usr/share)
-sysconfdir := $(if $(sysconfdir),$(sysconfdir),$(DESTDIR)/etc)
 tag := $(if $(tag),$(tag),HEAD)
 
 ifndef version
@@ -66,5 +65,4 @@ local: tar rpm
 git: gittar rpm
 
 install:
-	install --mode=644 -D apache.conf $(sysconfdir)/httpd/conf.d/spice-html5.conf
 	find . \( -iname '*.html' -or -iname '*.js' -or -iname '*.css' \) -exec install --mode=644 -D {} $(datadir)/spice-html5/{} \;
diff --git a/apache.conf b/apache.conf
deleted file mode 100644
index f3bd2fe..0000000
--- a/apache.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# spice-html5 is a Javascript SPICE client
-#
-Alias /spice /usr/share/spice-html5
-<Directory /usr/share/spice-html5>
-    # This page is broadly available, tune here to make it more restricted.
-    Allow from all
-    Satisfy Any
-    DirectoryIndex spice.html
-</Directory>
diff --git a/apache.conf.sample b/apache.conf.sample
new file mode 100644
index 0000000..f3bd2fe
--- /dev/null
+++ b/apache.conf.sample
@@ -0,0 +1,10 @@
+#
+# spice-html5 is a Javascript SPICE client
+#
+Alias /spice /usr/share/spice-html5
+<Directory /usr/share/spice-html5>
+    # This page is broadly available, tune here to make it more restricted.
+    Allow from all
+    Satisfy Any
+    DirectoryIndex spice.html
+</Directory>
diff --git a/spice-html5.spec.in b/spice-html5.spec.in
index 6c10817..928d88b 100644
--- a/spice-html5.spec.in
+++ b/spice-html5.spec.in
@@ -25,14 +25,14 @@ file for Apache, but should work with any web server.
 
 
 %files
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %{_datadir}/%{name}
-%doc COPYING COPYING.LESSER README TODO
+%doc COPYING COPYING.LESSER README TODO apache.conf.sample
 
 
 %changelog
 * Wed Feb 20 2013 Jeremy White <jwhite at codeweavers.com> 0.1.2-1
 - Revise the .spec file to use %{name}, and remove a few unneded statements
+- No longer install apache.conf, just put a sample under doc/
 
 * Wed Feb 13 2013 Jeremy White <jwhite at codeweavers.com> 0.1.1-1
 - Correct the license to LGPL
-- 
1.7.10.4