- drop obsolete and outdated manual inclusion of rpm macros

[packages/php-pear-HTML_Template_Flexy.git] / php-pear-HTML_Template_Flexy.spec

diff --git a/php-pear-HTML_Template_Flexy.spec b/php-pear-HTML_Template_Flexy.spec
index 069ee994ff5ff1608aaae7e7f498773e88070c69..a3fd9ab5a863adcb39e8223e8a4d75a2afd994ba 100644 (file)
--- a/php-pear-HTML_Template_Flexy.spec
+++ b/php-pear-HTML_Template_Flexy.spec
@@ -1,34 +1,32 @@
-%include       /usr/lib/rpm/macros.php
-%define                _class          HTML
-%define                _subclass       Template
-%define                _status         stable
-%define                _pearname       %{_class}_%{_subclass}_Flexy
-Summary:       %{_pearname} - a flexible caching template engine based on SimpleTemplate
-Summary(pl.UTF-8):     %{_pearname} - elastyczny buforujący silnik szablonów oparty na SimpleTemplate
-Name:          php-pear-%{_pearname}
-Version:       1.3.10
-Release:       2
+%define                status          stable
+%define                pearname        HTML_Template_Flexy
+Summary:       %{pearname} - a flexible caching template engine based on SimpleTemplate
+Summary(pl.UTF-8):     %{pearname} - elastyczny buforujący silnik szablonów oparty na SimpleTemplate
+Name:          php-pear-%{pearname}
+Version:       1.3.13
+Release:       1

 License:       PHP 2.02
 Group:         Development/Languages/PHP
 License:       PHP 2.02
 Group:         Development/Languages/PHP

-Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 5bbc01bcfabbdeeeb79aeffc448be06e
+Source0:       http://pear.php.net/get/%{pearname}-%{version}.tgz
+# Source0-md5: b2927f235ba75660dcc0f3a6257279d1

 Patch0:                %{name}-case_fix.patch
 Patch1:                %{name}-path_fix.patch
 Patch2:                %{name}-no_gtk.patch
 URL:           http://pear.php.net/package/HTML_Template_Flexy/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 Patch0:                %{name}-case_fix.patch
 Patch1:                %{name}-path_fix.patch
 Patch2:                %{name}-no_gtk.patch
 URL:           http://pear.php.net/package/HTML_Template_Flexy/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11

-BuildRequires: rpmbuild(macros) >= 1.300
-Requires:      php-common >= 3:4.3
+BuildRequires: rpmbuild(macros) >= 1.654
+Requires:      php(core) >= 4.3

 Requires:      php-pear
 Suggests:      php-pear-File_Gettext
 Suggests:      php-pear-HTML_Javascript
 Suggests:      php-pear-Translation2
 Requires:      php-pear
 Suggests:      php-pear-File_Gettext
 Suggests:      php-pear-HTML_Javascript
 Suggests:      php-pear-Translation2

+Obsoletes:     php-pear-HTML_Template_Flexy-tests

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # exclude optional dependencies
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # exclude optional dependencies

-%define                _noautoreq      'pear(HTML/Javascript.*)' 'pear(File/Gettext.*)' 'pear(Translation2.*)' 'pear(Services/JSON.php)'
+%define                _noautoreq_pear HTML/Javascript.* File/Gettext.* Translation2.* Services/JSON.php

 
 %description
 HTML_Template_Flexy started its life as a simplification of
 
 %description
 HTML_Template_Flexy started its life as a simplification of


@@ -65,7 +63,7 @@ The long term plan for Flexy is to be integrated as a backend for the
 Future Template Package (A BC wrapper will be made available - as the
 author needs to use it too).
 
 Future Template Package (A BC wrapper will be made available - as the
 author needs to use it too).
 

-In PEAR status of this package is: %{_status}.
+In PEAR status of this package is: %{status}.

 
 %description -l pl.UTF-8
 HTML_Template_Flexy początkowo był uproszczeniem HTML_Template_Xipe,
 
 %description -l pl.UTF-8
 HTML_Template_Flexy początkowo był uproszczeniem HTML_Template_Xipe,


@@ -102,25 +100,11 @@ Długoterminowym planem rozwoju Flexy jest zintegrowanie jako backend
 dla Future Template Package (dostępny będzie wrapper BC, jako że autor
 też musi tego używać).
 
 dla Future Template Package (dostępny będzie wrapper BC, jako że autor
 też musi tego używać).
 

-Ta klasa ma w PEAR status: %{_status}.
-
-%package tests
-Summary:       Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):     Testy dla PEAR::%{_pearname}
-Group:         Development/Languages/PHP
-Requires:      %{name} = %{version}-%{release}
-AutoProv:      no
-AutoReq:       no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
+Ta klasa ma w PEAR status: %{status}.

 
 %prep
 %pear_package_setup
 
 %prep
 %pear_package_setup

-cd ./%{php_pear_dir}/%{_class}/%{_subclass}
+cd ./%{php_pear_dir}/HTML/Template

 %patch0 -p1
 %patch1 -p1
 %patch2 -p6
 %patch0 -p1
 %patch1 -p1
 %patch2 -p6


@@ -134,25 +118,16 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 

+%post -p <lua>
+%pear_package_print_optionalpackages

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post
-if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
-       cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-fi
-

 %files
 %defattr(644,root,root,755)
 %files
 %defattr(644,root,root,755)

-%doc install.log optional-packages.txt
-%doc TODO ChangeLog
+%doc TODO ChangeLog install.log optional-packages.txt

 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/.registry/*.reg

-%{php_pear_dir}/%{_class}/%{_subclass}/Flexy
-%{php_pear_dir}/%{_class}/%{_subclass}/Flexy.php
-
-%{php_pear_dir}/data/%{_pearname}
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*
+%{php_pear_dir}/HTML/Template/Flexy
+%{php_pear_dir}/HTML/Template/Flexy.php
+%{php_pear_dir}/data/%{pearname}