diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-01-16 16:18:04 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-01-16 16:18:04 +0100 |
| commit | bce66ea3de54958c2d0ab6e8af5c80f496f26ad3 (patch) | |
| tree | 30d31931b4981fed4f82fa74d3e2b620aba93818 | |
| parent | 5375eb894be0eaf2059eb8090e742b99c7a0fc6a (diff) | |
php-horde-Horde-Core: use system prototype
| -rw-r--r-- | php-horde-Horde-Core.spec | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec index 04760df..cc51c15 100644 --- a/php-horde-Horde-Core.spec +++ b/php-horde-Horde-Core.spec @@ -28,6 +28,7 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Group) >= 2.0.0 Requires(post): %{__pear} Requires(postun): %{__pear} +Requires: prototype Requires: php-common >= 5.3.0 Requires: php-date Requires: php-dom @@ -117,6 +118,8 @@ Conflicts: php-pear(%{pear_channel}/Horde_View) >= 3.0.0 # Optional Requires: php-pecl(LZF) Requires: php-pear(Net_DNS2) +Requires: php-pear(Text_CAPTCHA) +Requires: php-pear(Text_Figlet) Requires: php-pear(%{pear_channel}/Horde_Crypt) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Crypt) >= 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Editor) >= 2.0.0 @@ -145,8 +148,6 @@ Requires: php-pear(%{pear_channel}/Horde_Tree) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Tree) >= 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Vfs) >= 3.0.0 -Requires: php-pear(Text_CAPTCHA) -Requires: php-pear(Text_Figlet) # Horde_ActiveSync, Horde_ElasticSearch, Horde_Kolab_Server # Horde_Kolab_Session, Horde_Kolab_Storage, Horde_Oauth, Horde_Service_Twitter @@ -165,8 +166,10 @@ Framework. cd %{pear_name}-%{version} # Don't install .po and .pot files +# Don't install prototype, use system one # Remove checksum for .mo, as we regenerate them sed -e '/%{pear_name}.po/d' \ + -e '/prototype.js/d' \ -e '/LICENSE/s/role="horde"/role="doc"/' \ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml @@ -201,6 +204,10 @@ do echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc" done | tee ../%{pear_name}.lang +# Create a symlink to system prototype +# Can't be relative as hordedir defined somewhere else +ln -s %{_datadir}/prototype/prototype.js %{buildroot}%{pear_hordedir}/js/prototype.js + %check src=$(pwd)/%{pear_name}-%{version} @@ -252,6 +259,7 @@ fi * Wed Jan 16 2013 Remi Collet <remi@fedoraproject.org> - 2.1.5-3 - spec cleanups - more optional requires Text_CAPTCHA and Text_Figlet +- use system prototype * Sat Jan 12 2013 Remi Collet <remi@fedoraproject.org> - 2.1.5-2 - add optional requires on Horde_Editor and Horde_SpellChecker |