- each plugin it's own dir in jquery is more cleaner; rel 2

Changed files:
    jquery-fancybox.spec -> 1.5

diff --git a/jquery-fancybox.spec b/jquery-fancybox.spec
index 19435a45b5cfae1e54274764d4a6015464386197..d73ab5027bb2fbe1076be81ee1901432c1e4ce4a 100644 (file)
--- a/jquery-fancybox.spec
+++ b/jquery-fancybox.spec
@@ -1,19 +1,22 @@
+# TODO
+# - pkg for mousewheel
+%define                plugin  fancybox
 Summary:       Fancybox - Fancy lightbox alternative
-Name:          jquery-fancybox
+Name:          jquery-%{plugin}
 Version:       1.3.1
-Release:       0.4
+Release:       1
 License:       MIT / GPL v2
 Group:         Applications/WWW
 Source0:       http://fancybox.googlecode.com/files/jquery.fancybox-%{version}.zip
 # Source0-md5: d72d950a798ffaa83750dfd6e4a0e382
 URL:           http://www.fancybox.net/
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.565
 BuildRequires: unzip
 Requires:      jquery >= 1.3
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _appdir         %{_datadir}/jquery
+%define                _appdir %{_datadir}/jquery/%{plugin}
 
 %description
 FancyBox is a tool for displaying images, html content and multi-media
@@ -41,7 +44,7 @@ Demonstrations and samples for jQuery.fancybox.
 %prep
 %setup -qn jquery.fancybox-%{version}
 
-find '(' -name '*.js' -o -name '*.html' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+%undos -f js,html,txt
 
 mv fancybox/jquery.fancybox{-%{version},}.css
 mv fancybox/jquery.fancybox{-%{version}.pack,}.js
@@ -53,27 +56,47 @@ mv fancybox/jquery.fancybox-%{version}.js src/jquery.fancybox.js
 # deps - rename for now
 mv fancybox/jquery.easing{-1.3.pack,}.js # ? not used?
 mv fancybox/jquery.mousewheel{-3.0.2.pack,}.js
+# otherwise yuicompressor won't pack
+sed -i -e 's,^/\*!,/*,' fancybox/jquery.mousewheel.js
 
 # adjust demos to work offline
 mv index.html style.css ajax.txt example demo
-ln -s %{_appdir}/jquery.js demo
-ln -s %{_appdir}/fancybox demo
+ln -s %{_datadir}/jquery demo
 
 sed -i -e '
-       s,./fancybox/jquery.fancybox-1.3.1.js,fancybox/jquery.fancybox.js,
-       s,./fancybox/jquery.fancybox-1.3.1.css,fancybox/jquery.fancybox.css,
+       s,./fancybox/jquery.fancybox-1.3.1.js,jquery/fancybox/fancybox.js,
+       s,./fancybox/jquery.fancybox-1.3.1.css,jquery/fancybox/fancybox.css,
 
-       s,http://code.jquery.com/jquery-1.4.2.min.js,jquery.js,
+       s,http://code.jquery.com/jquery-1.4.2.min.js,jquery/jquery.js,
 
-       s,./fancybox/jquery.mousewheel-3.0.2.pack.js,fancybox/jquery.mousewheel.js,
+       s,./fancybox/jquery.mousewheel-3.0.2.pack.js,jquery/fancybox/mousewheel.js,
 
        s,./example/,example/,g
 ' demo/index.html
 
+%build
+install -d build
+
+# compress .js
+for js in fancybox/*.js; do
+       out=build/${js#*/jquery.}
+       yuicompressor --charset UTF-8 $js -o $out
+       js -C -f $out
+done
+
+# pack .css
+for css in fancybox/*.css; do
+       out=build/${css#*/jquery.}
+       yuicompressor --charset UTF-8 $css -o $out
+done
+
+cp -a fancybox/*.png build
+cp -a fancybox/*.gif build
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_examplesdir}/%{name}-%{version}}
-cp -a fancybox $RPM_BUILD_ROOT%{_appdir}
+cp -a build/* $RPM_BUILD_ROOT%{_appdir}
 cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -81,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_appdir}/fancybox
+%{_appdir}
 
 %files demo
 %defattr(644,root,root,755)