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.sample similarity index 100% rename from apache.conf rename to 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 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 0.1.1-1 - Correct the license to LGPL