- up to 2012-08-08

diff --git a/dokuwiki-plugin-lightbox.spec b/dokuwiki-plugin-lightbox.spec
index 6f7de6da18877405883ba1febdb14f4fd562983c..bc2e963d7e8af06ad8de5163d50261e375b9705f 100644 (file)
--- a/dokuwiki-plugin-lightbox.spec
+++ b/dokuwiki-plugin-lightbox.spec
@@ -1,17 +1,17 @@
 %define                plugin          lightbox
+%define                ver                     2012-08-08
+%define                rpmver          %(echo %{ver} | tr -d -)
 Summary:       DokuWiki Lightbox plugin
 Summary(pl.UTF-8):     Wtyczka lightbox dla DokuWiki
 Name:          dokuwiki-plugin-%{plugin}
-Version:       20120103
-Release:       0.10
+Version:       %{rpmver}
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
-#Source0:      https://github.com/downloads/glensc/dokuwiki-plugin-lightboxv2/lightbox-%{version}.tar.bz2
-Source0:       https://github.com/glensc/dokuwiki-plugin-lightboxv2/tarball/master/%{plugin}-%{version}.tgz
-# Source0-md5: 156c43be191bebf757874d1a7c8ca67b
-Source1:       https://github.com/krewenki/jquery-lightbox/tarball/master/jquery-lightbox.tgz
-# Source1-md5: 14b30ba99c15cf2bb52af3ae21398969
+Source0:       https://github.com/downloads/glensc/dokuwiki-plugin-lightboxv2/lightbox-%{ver}.zip
+# Source0-md5: 3bb365f181fe18520154f8debb9931d4
 URL:           http://www.dokuwiki.org/plugin:lightboxv2
+BuildRequires: unzip
 Requires:      dokuwiki >= 20111110
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,9 +24,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Plugin to integrate Lightbox JavaScript animation in DokuWiki.
 
 %prep
-%setup -qc -a1
-mv *-%{plugin}v2-*/* .
-mv *-jquery-lightbox-*/* jquery-lightbox
+%setup -qc
+mv %{plugin}/* .
 
 version=$(awk '/^date/{print $2}' plugin.info.txt)
 if [ $(echo "$version" | tr -d -) != %{version} ]; then
@@ -34,13 +33,8 @@ if [ $(echo "$version" | tr -d -) != %{version} ]; then
        exit 1
 fi
 
-%build
-sh -x build.sh
-tar xjf lightbox-*.tar.bz2
-
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{plugin}
 install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
 %{__rm} $RPM_BUILD_ROOT%{plugindir}/AUTHORS
@@ -60,5 +54,6 @@ fi
 %dir %{plugindir}
 %{plugindir}/*.css
 %{plugindir}/*.js
+%{plugindir}/*.php
 %{plugindir}/*.txt
 %{plugindir}/images