diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-04-09 08:40:06 +0200 | 
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-04-09 08:40:06 +0200 | 
| commit | 783134a0a6364f7ed1d3c356441312c5630e48f1 (patch) | |
| tree | e0d05168faec411abee146973b7e5b440ed5d394 | |
| parent | 4a2f26c9590bfccf84da375286a5f8cce79db204 (diff) | |
horde: minor cleanups from rawhide
| -rw-r--r-- | php-horde-Horde-Mime.spec | 12 | 
1 files changed, 9 insertions, 3 deletions
diff --git a/php-horde-Horde-Mime.spec b/php-horde-Horde-Mime.spec index 1a619cd..964ab7a 100644 --- a/php-horde-Horde-Mime.spec +++ b/php-horde-Horde-Mime.spec @@ -1,4 +1,3 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}  %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}  %global pear_name    Horde_Mime  %global pear_channel pear.horde.org @@ -12,12 +11,15 @@ Release:        1%{?dist}  Summary:        Horde MIME Library  Group:          Development/Libraries -License:        LGPLv2 +# lib/Horde/Mime.php is BSD and LGPLv2 +# other files are LGPLv2 +License:        LGPLv2 and BSD  URL:            http://pear.horde.org  Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root  BuildArch:      noarch +BuildRequires:  php(language) >= 5.3.0  BuildRequires:  php-pear(PEAR) >= 1.7.0  BuildRequires:  php-channel(%{pear_channel})  BuildRequires:  gettext @@ -34,7 +36,7 @@ Requires:       php-date  Requires:       php-fileinfo  Requires:       php-pcre  Requires:       php-spl -BuildRequires:  php-pear(PEAR) >= 1.7.0 +Requires:       php-pear(PEAR) >= 1.7.0  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 @@ -55,6 +57,7 @@ Requires:       php-pear(%{pear_channel}/Horde_Nls) >= 2.0.0  Conflicts:      php-pear(%{pear_channel}/Horde_Nls) >= 3.0.0  Requires:       php-pear(%{pear_channel}/Horde_Text_Filter) >= 2.0.0  Conflicts:      php-pear(%{pear_channel}/Horde_Text_Filter) >= 3.0.0 +Requires:       php-intl  Requires:       php-pear(Net_DNS2)  Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -147,6 +150,9 @@ fi  - Update to 2.1.0  - Requires Horde_Support >= 2.1.0 +* Tue Mar 26 2013 Nick Bebout <nb@fedoraproject.org> - 2.0.4-2 +- Update for review +  * Tue Feb 12 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-1  - Update to 2.0.4  | 
