Author: glen Date: Fri Jun 4 14:25:25 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- merge from DEVEL
---- Files affected:
packages/jquery-thickbox:
jquery-thickbox.spec (1.14 -> 1.15) , translation.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/jquery-thickbox/jquery-thickbox.spec
diff -u packages/jquery-thickbox/jquery-thickbox.spec:1.14
packages/jquery-thickbox/jquery-thickbox.spec:1.15
--- packages/jquery-thickbox/jquery-thickbox.spec:1.14 Fri Jun 4 15:31:47 2010
+++ packages/jquery-thickbox/jquery-thickbox.spec Fri Jun 4 16:25:20 2010
@@ -1,16 +1,27 @@
# $Revision$, $Date$
-# NOTE:
-# - the tarball is created by this same spec on DEVEL branch
Summary: ThickBox
Name: jquery-thickbox
Version: 3.1
Release: 8
License: MIT / GPL
Group: Applications/WWW
-Source0: %{name}-%{version}-8.tar.bz2
-# Source0-md5: a48ab071d8b2c118fa2d2a609551b6fd
+Source0: http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
+# Source0-md5: 1ef1a46c2b1b984cdc3332eb74bad1d5
+Source1: http://jquery.com/demo/thickbox/thickbox-code/thickbox.css
+# Source1-md5: 9b2903ebee6d54b3e63ba927ea5dd498
+Source2: http://jquery.com/demo/thickbox/images/loadingAnimation.gif
+# Source2-md5: c33734a1bf58bec328ffa27872e96ae1
+Source3: http://jquery.com/demo/thickbox/images/macFFBgHack.png
+# Source3-md5: 6e63d8058c61e28953cc285de8d5c37d
URL: http://jquery.com/demo/thickbox/
+Patch0: no-global-css.patch
+Patch1: no-doctype.patch
+Patch2: animation-url.patch
+Patch3: hide-peek-trough-obj.patch
+Patch4: translation.patch
+BuildRequires: js
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: yuicompressor
Requires: jquery
Requires: webapps
Requires: webserver(alias)
@@ -29,12 +40,53 @@
AJAX in a hybrid modal.
%prep
-%setup -qc
+%setup -qcT
+cp -a %{SOURCE0} .
+cp -a %{SOURCE1} .
+cp -a %{SOURCE2} .
+cp -a %{SOURCE3} .
+%patch0 -p1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p0
+%patch4 -p0
+
+# Apache 1.3 / Apache 2.x config
+cat > apache.conf <<'EOF'
+Alias /js/thickbox %{_appdir}
+<Directory %{_appdir}>
+ Allow from all
+</Directory>
+EOF
+
+# lighttpd conf
+cat > lighttpd.conf <<'EOF'
+alias.url += (
+ "/js/thickbox" => "%{_appdir}",
+)
+EOF
+
+%build
+for a in *.js; do
+ yuicompressor --charset UTF-8 --type js $a -o tmp
+ mv tmp $a
+ js -C -f $a
+done
+for a in *.css; do
+ yuicompressor --charset UTF-8 --type css $a -o tmp
+ mv tmp $a
+done
+
+tarball=%{_sourcedir}/%{name}-%{version}-%{release}.tar.bz2
+tar cjf $tarball *
+%{_topdir}/dropin $tarball
+exit 1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
cp -a *.js *.css *.gif *.png $RPM_BUILD_ROOT%{_appdir}
+
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
@@ -74,6 +126,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2010/06/04 14:25:20 glen
+- merge from DEVEL
+
Revision 1.14 2010/06/04 13:31:47 glen
- typo
================================================================
Index: packages/jquery-thickbox/translation.patch
diff -u /dev/null packages/jquery-thickbox/translation.patch:1.2
--- /dev/null Fri Jun 4 16:25:25 2010
+++ packages/jquery-thickbox/translation.patch Fri Jun 4 16:25:20 2010
@@ -0,0 +1,39 @@
+--- thickbox.js~ 2010-05-05 15:24:43.823429470 +0300
++++ thickbox.js 2010-05-05 15:27:38.426379283 +0300
+@@ -6,7 +6,8 @@
+ */
+
+ var tb_pathToImage = "/js/thickbox/loadingAnimation.gif";
+-
++var tb_closeButton = 'Close';
++var tb_closeMsg = 'Close';
+ /*!!!!!!!!!!!!!!!!! edit below this line at your own risk
!!!!!!!!!!!!!!!!!!!!!!!*/
+
+ //on page load call tb_init
+@@ -146,7 +147,7 @@
+
+ TB_WIDTH = imageWidth + 30;
+ TB_HEIGHT = imageHeight + 60;
+- $("#TB_window").append("<a href='' id='TB_ImageOff'
title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"'
height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div
id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount +
TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#'
id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");
++ $("#TB_window").append("<a href='' id='TB_ImageOff'
title='"+tb_closeMsg+"'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"'
height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div
id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount +
TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#'
id='TB_closeWindowButton' title='"+tb_closeMsg+"'>"+ tb_closeButton
+"</a></div>");
+
+ $("#TB_closeWindowButton").click(tb_remove);
+
+@@ -214,7 +215,7 @@
+ urlNoQuery = url.split('TB_');
+ $("#TB_iframeContent").remove();
+ if(params['modal'] != "true"){//iframe
no modal
+- $("#TB_window").append("<div
id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div
id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'
title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0'
hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent'
name='TB_iframeContent"+Math.round(Math.random()*1000)+"'
onload='tb_showIframe()' style='width:"+(ajaxContentW +
29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
++ $("#TB_window").append("<div
id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div
id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'
title='"+tb_closeMsg+"'>"+ tb_closeButton +"</a></div></div><iframe
frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent'
name='TB_iframeContent"+Math.round(Math.random()*1000)+"'
onload='tb_showIframe()' style='width:"+(ajaxContentW +
29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
+ }else{//iframe modal
+ $("#TB_overlay").unbind();
+ $("#TB_window").append("<iframe
frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent'
name='TB_iframeContent"+Math.round(Math.random()*1000)+"'
onload='tb_showIframe()' style='width:"+(ajaxContentW +
29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
+@@ -222,7 +223,7 @@
+ }else{// not an iframe, ajax
+ if($("#TB_window").css("display") !=
"block"){
+ if(params['modal'] !=
"true"){//ajax no modal
+- $("#TB_window").append("<div
id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div
id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc
Key</div></div><div id='TB_ajaxContent'
style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
++ $("#TB_window").append("<div
id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div
id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>"+ tb_closeButton
+"</a></div></div><div id='TB_ajaxContent'
style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
+ }else{//ajax modal
+ $("#TB_overlay").unbind();
+ $("#TB_window").append("<div
id='TB_ajaxContent' class='TB_modal'
style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/jquery-thickbox.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/translation.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
