[packages/js-swfobject] move webserver configs to separate files

glen glen at pld-linux.org
Thu Nov 29 22:18:33 CET 2012


commit 2b88ade0eb7488ef0774edc52b4081d7054c9fe7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 29 23:14:20 2012 +0200

    move webserver configs to separate files

 apache.conf       |  5 +++++
 js-swfobject.spec | 28 ++++++++--------------------
 lighttpd.conf     |  3 +++
 3 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/js-swfobject.spec b/js-swfobject.spec
index 0b2c51a..a9dd148 100644
--- a/js-swfobject.spec
+++ b/js-swfobject.spec
@@ -8,6 +8,8 @@ License:	MIT
 Group:		Applications/WWW
 Source0:	http://swfobject.googlecode.com/files/swfobject_%{ver}.zip
 # Source0-md5:	dec4b83b3e73f3f0011a075cd5385b9c
+Source1:	apache.conf
+Source2:	lighttpd.conf
 URL:		http://code.google.com/p/swfobject/
 BuildRequires:	unzip
 Requires:	webapps
@@ -41,32 +43,18 @@ poprawnych dokumentach HTML oraz XHTML 1.0 i jest zgodny w przód, więc
 powinien działać jeszcze przez wiele lat.
 
 %prep
-%setup -q -n %{_webapp}
-
-# Apache conf
-cat > apache.conf <<'EOF'
-Alias /js/swfobject.js %{_appdir}/swfobject.js
-<Directory %{_appdir}>
-	Allow from all
-</Directory>
-EOF
-
-# lighttpd conf
-cat > lighttpd.conf <<'EOF'
-alias.url += (
-    "/js/swfobject.js" => "%{_appdir}/swfobject.js",
-)
-EOF
+%setup -qc
+mv %{_webapp}/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
-cp -a swfobject.js $RPM_BUILD_ROOT%{_appdir}
+cp -p swfobject.js $RPM_BUILD_ROOT%{_appdir}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/apache.conf b/apache.conf
new file mode 100644
index 0000000..ca45558
--- /dev/null
+++ b/apache.conf
@@ -0,0 +1,5 @@
+Alias /js/swfobject.js /usr/share/swfobject/swfobject.js
+<Directory /usr/share/swfobject>
+	Allow from all
+	Options +FollowSymLinks
+</Directory>
diff --git a/lighttpd.conf b/lighttpd.conf
new file mode 100644
index 0000000..b2104ea
--- /dev/null
+++ b/lighttpd.conf
@@ -0,0 +1,3 @@
+alias.url += (
+    "/js/swfobject.js" => "/usr/share/swfobject/swfobject.js",
+)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-swfobject.git/commitdiff/e2425b4ec0539c6fb119b2e6a710a66bf2341642



More information about the pld-cvs-commit mailing list