openstack/deb-spice-html5
Code Issues Proposed changes

No longer install apache.conf, just put it in the doc folder.

Browse Source
This commit is contained in:
Jeremy White 2013-02-20 11:08:09 -06:00
parent b09d7170ea
commit 3f64ddba3a
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,6 @@
DESTDIR := $(if $(DESTDIR),$(DESTDIR),/) DESTDIR := $(if $(DESTDIR),$(DESTDIR),/)
datadir := $(if $(datadir),$(datadir),$(DESTDIR)/usr/share) datadir := $(if $(datadir),$(datadir),$(DESTDIR)/usr/share)
sysconfdir := $(if $(sysconfdir),$(sysconfdir),$(DESTDIR)/etc)
tag := $(if $(tag),$(tag),HEAD) tag := $(if $(tag),$(tag),HEAD)
ifndef version ifndef version
@ -66,5 +65,4 @@ local: tar rpm
git: gittar rpm git: gittar rpm
install: 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/{} \; find . \( -iname '*.html' -or -iname '*.js' -or -iname '*.css' \) -exec install --mode=644 -D {} $(datadir)/spice-html5/{} \;

0
apache.conf → apache.conf.sample
View File

4
spice-html5.spec.in
View File

@ -25,14 +25,14 @@ file for Apache, but should work with any web server.
%files %files
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name} %{_datadir}/%{name}
%doc COPYING COPYING.LESSER README TODO %doc COPYING COPYING.LESSER README TODO apache.conf.sample
%changelog %changelog
* Wed Feb 20 2013 Jeremy White <jwhite@codeweavers.com> 0.1.2-1 * 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 - 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 * Wed Feb 13 2013 Jeremy White <jwhite@codeweavers.com> 0.1.1-1
- Correct the license to LGPL - Correct the license to LGPL