packages: js-syntaxhighlighter/js-syntaxhighlighter.spec - test bcond is th...

[glen]

Author: glen                         Date: Tue Apr 27 21:28:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- test bcond is there to disable testing process, not test data, so package the file as %doc
- apache.conf is for apache 1.3 and apache 2.x (as httpd.conf)

---- Files affected:
packages/js-syntaxhighlighter:
   js-syntaxhighlighter.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/js-syntaxhighlighter/js-syntaxhighlighter.spec
diff -u packages/js-syntaxhighlighter/js-syntaxhighlighter.spec:1.2 packages/js-syntaxhighlighter/js-syntaxhighlighter.spec:1.3
--- packages/js-syntaxhighlighter/js-syntaxhighlighter.spec:1.2	Tue Apr 27 23:21:54 2010
+++ packages/js-syntaxhighlighter/js-syntaxhighlighter.spec	Tue Apr 27 23:28:22 2010
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%bcond_with	test	# install test.html
 Summary:	JavaScript syntax highlighter
 Summary(pl.UTF-8):	Podświetlacz składni napisany w JavaScript
 Name:		js-syntaxhighlighter
@@ -33,7 +32,7 @@
 %prep
 %setup -qc
 
-# Apache1 conf
+# Apache 1.3/Apache 2.x config
 cat > apache.conf <<'EOF'
 Alias /js/syntaxhighlighter %{_appdir}
 <Directory %{_appdir}>
@@ -41,17 +40,17 @@
 </Directory>
 EOF
 
-# lighttpd conf
+# Lighttpd config
 cat > lighttpd.conf <<'EOF'
 alias.url += (
-    "/js/syntaxhighlighter" => "%{_appdir}",
+	"/js/syntaxhighlighter" => "%{_appdir}",
 )
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
-cp -a %{?with_test:test.html} scripts styles $RPM_BUILD_ROOT%{_appdir}
+cp -a scripts styles $RPM_BUILD_ROOT%{_appdir}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -81,6 +80,7 @@
 
 %files
 %defattr(644,root,root,755)
+%doc test.html
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -93,9 +93,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/04/27 21:28:22  glen
+- test bcond is there to disable testing process, not test data, so package the file as %doc
+- apache.conf is for apache 1.3 and apache 2.x (as httpd.conf)
+
 Revision 1.2  2010/04/27 21:21:54  pawelz
 - fix webserver configs
 
 Revision 1.1  2010/04/27 21:10:55  pawelz
 - initial PLD release
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/js-syntaxhighlighter/js-syntaxhighlighter.spec?r1=1.2&r2=1.3&f=u