- update

Changed files:
    dokuwiki-plugin.spec -> 1.11
    php-package.spec -> 1.6

diff --git a/dokuwiki-plugin.spec b/dokuwiki-plugin.spec
index fc131b67dcd3ae0e7bd61adccbb24de61bf69a62..fa69cf533b5e661868beb3b968eeaef9d232ade3 100644 (file)
--- a/dokuwiki-plugin.spec
+++ b/dokuwiki-plugin.spec
@@ -34,6 +34,7 @@ mv %{plugin}/* .
 
 version=$(cat VERSION)
 version=$(awk '/date/{print $2}' plugin.info.txt)
+version=$(awk -F"'" '/date/{print $4}' syntax.php)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
        : %%{version} mismatch
        exit 1

diff --git a/php-package.spec b/php-package.spec
index 6b4becfd893103b4e8649aa438c42a0fcb7f4c98..7c6477c013817f428f0c884c0ec9f43ce8e6635b 100644 (file)
--- a/php-package.spec
+++ b/php-package.spec
@@ -1,6 +1,4 @@
-%if %{with phpdeps}
-%include       /usr/lib/rpm/macros.php
-%endif
+%{?with_phpdeps:%include       /usr/lib/rpm/macros.php}
 # new php based depsolver will look into this macro, however it works in static
 # manner too.
 %define                php_min_version 5.0.0
@@ -19,6 +17,8 @@ BuildRequires:        /usr/bin/php
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 %endif
 BuildRequires: rpmbuild(macros) >= 1.461
+# for %%undos macro
+BuildRequires: rpmbuild(macros) >= 1.553
 Requires:      php-common >= 4:%{php_min_version}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,10 +29,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _phpdocdir              %{_docdir}/phpdoc
 
 # bad depsolver
-%define                _noautopear     pear(class.template.php) pear(/etc/webapps/template/config.php)
+%define                _noautopear     pear
 
 # exclude optional php dependencies
-%define                _noautophp      php-bzip2 php-bcmath php-zip php-date php-ftp php-hash php-ldap php-mbstring php-mysql php-pgsql php-tokenizer
+%define                _noautophp      php-curl
 
 # put it together for rpmbuild
 %define                _noautoreq      %{?_noautophp} %{?_noautopear}
@@ -73,6 +73,7 @@ Dokumentacja do %{name}.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
+install -d $RPM_BUILD_ROOT%{php_data_dir}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -93,4 +94,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files phpdoc
 %defattr(644,root,root,755)
-%{_phpdocdir}/%{name}
+%{_phpdocdir}/%{pkgname}