[php-pear-HTML_Template_PHPLIB] - update to 1.5.2 - define metadir, fix FTBFS #914362 - rename HTML_Template_PHPLIB.xml to php-pear-

[Remi Collet]

commit fc7b1897f6f1f111756daba74e935ee03f1d9370
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Aug 7 15:37:53 2013 +0200

    - update to 1.5.2
    - define metadir, fix FTBFS #914362
    - rename HTML_Template_PHPLIB.xml to php-pear-HTML_Template_PHPLIB.xml
    - keep doc in /usr/share/doc/pear
    - fix README role and encoding in %prep
    - cleanups

 .gitignore                         |    1 +
 php-pear-HTML_Template_PHPLIB.spec |   57 +++++++++++++++++++----------------
 sources                            |    2 +-
 3 files changed, 33 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc7c69b..45a91fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 HTML_Template_PHPLIB-1.4.0.tgz
+/HTML_Template_PHPLIB-1.5.2.tgz
diff --git a/php-pear-HTML_Template_PHPLIB.spec b/php-pear-HTML_Template_PHPLIB.spec
index 3248f52..e53b31a 100644
--- a/php-pear-HTML_Template_PHPLIB.spec
+++ b/php-pear-HTML_Template_PHPLIB.spec
@@ -2,62 +2,60 @@
 %global pear_name HTML_Template_PHPLIB
 
 Name:		php-pear-HTML_Template_PHPLIB
-Version:	1.4.0
-Release:	8%{?dist}
+Version:	1.5.2
+Release:	1%{?dist}
 Summary:	PHP template system based on preg_* 
 Group:		Development/Libraries
 License:	LGPLv2
 URL:		http://pear.php.net/package/%{pear_name}
 Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1:1.4.9-1.2
+BuildRequires:	php-pear
+
 Requires:	php-pear(PEAR)
+Requires:	php-pcre
 Requires(post):	%{__pear}
 Requires(postun):	%{__pear}
+
 Provides:	php-pear(%{pear_name}) = %{version}
 
+
 %description
 This is the PEAR port of the popular PHPLIB template system. It
 contains some features not currently found in the original version.
 
+
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
+sed -e '/README/s/role="data"/role="doc"/' \
+    -e '/README/s/md5sum=.*name=/name=/' \
+    ../package.xml >%{name}.xml
 
+iconv -f iso8859-1 -t utf-8 examples/README >examples/README.conv && \
+   mv -f examples/README.conv examples/README
 
 
 %build
 # Empty build section nothing to do here
 
+
 %install
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
+
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-# I could not do this in prep as it breaks the pear install due to md5 checks.
-iconv -f iso8859-1 -t utf-8 %{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README >	\
-%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv && \
-mv -f	%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv	\
-%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -67,14 +65,21 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc %{pear_docdir}/%{pear_name}
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/HTML/Template
 %{_bindir}/*
 
 %changelog
+* Wed Aug 07 2013 Remi Collet <remi at fedoraproject.org> - 1.5.2-1
+- update to 1.5.2
+- define metadir, fix FTBFS #914362
+- rename HTML_Template_PHPLIB.xml to php-pear-HTML_Template_PHPLIB.xml
+- keep doc in /usr/share/doc/pear
+- fix README role and encoding in %%prep
+- cleanups
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8272ca6..d110cb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffaec612100e05e989d859cea7a00bb2  HTML_Template_PHPLIB-1.4.0.tgz
+8acbb63d8e11d1331bcc6e6a37124d6c  HTML_Template_PHPLIB-1.5.2.tgz