diff options
| author | Jeremy White <jwhite@codeweavers.com> | 2013-02-20 11:08:09 -0600 |
|---|---|---|
| committer | Jeremy White <jwhite@codeweavers.com> | 2013-02-20 11:09:37 -0600 |
| commit | 3f64ddba3a744c07207de3c594cc23c70ced3ba3 (patch) | |
| tree | 0208a257cf8fd66d3c6fba2aeff343278463f611 | |
| parent | b09d7170eabf72642369c97c31a02d3da0c0a892 (diff) | |
No longer install apache.conf, just put it in the doc folder.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apache.conf.sample (renamed from apache.conf) | 0 | ||||
| -rw-r--r-- | spice-html5.spec.in | 4 |
3 files changed, 2 insertions, 4 deletions
@@ -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.sample index f3bd2fe..f3bd2fe 100644 --- a/apache.conf +++ b/apache.conf.sample 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@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@codeweavers.com> 0.1.1-1 - Correct the license to LGPL |