From 15784e8c077387bb5115c79c3379a96c02635ca4 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 1 Nov 2012 17:52:32 +0100
Subject: php-horde-Horde-Browser: 2.0.0

---
 php-horde-Horde-Browser.spec | 63 ++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 20 deletions(-)

(limited to 'php-horde-Horde-Browser.spec')

diff --git a/php-horde-Horde-Browser.spec b/php-horde-Horde-Browser.spec
index 417c928..4f5c8db 100644
--- a/php-horde-Horde-Browser.spec
+++ b/php-horde-Horde-Browser.spec
@@ -1,36 +1,46 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Horde_Browser
+%global pear_name    Horde_Browser
+%global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Browser
-Version:        1.0.7
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        Horde Browser API
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+# /usr/lib/rpm/find-lang.sh from fedora 16
+Source1:        find-lang.sh
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.7.0
+BuildRequires:  php-pear
+BuildRequires:  php-channel(%{pear_channel})
 BuildRequires:  gettext
-BuildRequires:  php-channel(pear.horde.org)
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.horde.org/Horde_Exception) < 2.0.0
-Requires:       php-pear(pear.horde.org/Horde_Util) < 2.0.0
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-channel(pear.horde.org)
+Requires:       php-channel(%{pear_channel})
+Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
-Provides:       php-pear(pear.horde.org/Horde_Browser) = %{version}
 
 %description
 The Horde_Browser class provides an API for getting information about the
 current user's browser and its capabilities.
 
+
 %prep
-%setup -q -c
+%setup -q -c -T
+tar xif %{SOURCE0}
+
 cd %{pear_name}-%{version}
 
 # Don't install .po and .pot files
@@ -40,6 +50,7 @@ sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
+
 %build
 cd %{pear_name}-%{version}
 
@@ -49,17 +60,24 @@ do
    msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
 done
 
+
 %install
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
+%if 0%{?fedora} > 13
 %find_lang %{pear_name}
+%else
+sh %{SOURCE1} %{buildroot} %{pear_name}
+%endif
+
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
@@ -68,21 +86,26 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        pear.horde.org/%{pear_name} >/dev/null || :
+        %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
+
 %files -f %{pear_name}-%{version}/%{pear_name}.lang
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Browser
 %{pear_phpdir}/Horde/Browser.php
 # own locales (non standard) directories, .mo own by find_lang
-%dir %{pear_datadir}/Horde_Browser
-%dir %{pear_datadir}/Horde_Browser/locale
-%dir %{pear_datadir}/Horde_Browser/locale/*
-%dir %{pear_datadir}/Horde_Browser/locale/*/LC_MESSAGES
+%dir %{pear_datadir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}/locale
+%dir %{pear_datadir}/%{pear_name}/locale/*
+%dir %{pear_datadir}/%{pear_name}/locale/*/LC_MESSAGES
+
 
 %changelog
+* Thu Nov  1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
+- Update to 2.0.0 for remi repo
+
 * Thu Jun 21 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.7-1
 - Upgrade to 1.0.7
 
-- 
cgit