- use new lua macros

Changed files:
    pearize.sh -> 1.47

diff --git a/pearize.sh b/pearize.sh
index 12f8030609c3c82436f422db476ab916751876c9..c3b460d8e51d8f73291a0581e8111c6047ea3ac9 100644 (file)
--- a/pearize.sh
+++ b/pearize.sh
@@ -150,15 +150,23 @@ if [ -n "$optional" ]; then
 fi
 has_opt=$(grep -Ec '^Optional-(pkg|ext):' $template || :)
 if [ "$has_opt" -gt 0 ]; then
-       if ! grep -q '%{_docdir}/.*/optional-packages.txt' $spec; then
+       if ! grep -q 'rpmbuild(macros)' $spec; then
+               sed -i -e '
+               /rpm-php-pearprov/{
+                       aBuildRequires: rpmbuild(macros) >= 1.300
+               }
+               ' $spec
+       fi
+       if ! grep -Eq '%{_docdir}/.*/optional-packages.txt|%pear_package_print_optionalpackages' $spec; then
                sed -i -e '
                /^%files$/{
-                       i%post
-                       iif [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
-                       i\      cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-                       ifi
+                       i%post -p <lua>
+                       i%pear_package_print_optionalpackages
                        i
                }
+               /rpmbuild(macros)/{
+                       s/>=.*/>= 1.571/
+               }
                ' $spec
        fi
        if ! grep -q '%doc.*optional-packages.txt' $spec; then