packages: jquery-thickbox/jquery-thickbox.spec - move to jquery dir, keep b...

[glen]

Author: glen                         Date: Fri Jun  4 14:46:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move to jquery dir, keep backward compat; rel 9

---- Files affected:
packages/jquery-thickbox:
   jquery-thickbox.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/jquery-thickbox/jquery-thickbox.spec
diff -u packages/jquery-thickbox/jquery-thickbox.spec:1.16 packages/jquery-thickbox/jquery-thickbox.spec:1.17
--- packages/jquery-thickbox/jquery-thickbox.spec:1.16	Fri Jun  4 16:27:38 2010
+++ packages/jquery-thickbox/jquery-thickbox.spec	Fri Jun  4 16:46:08 2010
@@ -1,8 +1,12 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	legacy		# do not build legacy webserver alias
+
 Summary:	ThickBox
 Name:		jquery-thickbox
 Version:	3.1
-Release:	8
+Release:	9
 License:	MIT / GPL
 Group:		Applications/WWW
 Source0:	http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
@@ -22,7 +26,7 @@
 BuildRequires:	js
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	yuicompressor
-Requires:	jquery
+Requires:	jquery >= 1.2.6-2
 Requires:	webapps
 Requires:	webserver(alias)
 BuildArch:	noarch
@@ -31,7 +35,8 @@
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
-%define		_appdir		%{_datadir}/%{name}
+%define		_appdir		%{_datadir}/jquery/thickbox
+%define		_legacydir	%{_datadir}/%{name}
 
 %description
 ThickBox is a webpage UI dialog widget written in JavaScript on top of
@@ -79,16 +84,23 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
+install -d $RPM_BUILD_ROOT%{_appdir}
 cp -a build/* $RPM_BUILD_ROOT%{_appdir}
 
+%if %{with legacy}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_legacydir}}
 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
+for a in $RPM_BUILD_ROOT%{_appdir}/*; do
+	ln -s %{_appdir}/$(basename $a) $RPM_BUILD_ROOT%{_legacydir}
+done
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with legacy}
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
@@ -106,14 +118,19 @@
 
 %triggerun -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
+%endif
 
 %files
 %defattr(644,root,root,755)
+%{_appdir}
+
+%if %{with legacy}
 %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
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
-%{_appdir}
+%{_legacydir}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -121,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/06/04 14:46:08  glen
+- move to jquery dir, keep backward compat; rel 9
+
 Revision 1.16  2010/06/04 14:27:38  glen
 - update build system
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/jquery-thickbox.spec?r1=1.16&r2=1.17&f=u