From faa2dc574be3d56a0ad74c001fcfb99ee7bb0f98 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Sep 2014 15:15:00 +0200 Subject: php-horde-horde - don't use system javascript libraries as this breaks horde and its cache system - use /var/log/horde for logging - use /var/lib/horde/cache for caching - use /var/lib/horde/static for js and css cache - fix regex filter, fix missing horde-power*.png --- php-horde-Horde-Mime-Viewer.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/php-horde-Horde-Mime-Viewer.spec b/php-horde-Horde-Mime-Viewer.spec index 4fe44b2..d3ea636 100644 --- a/php-horde-Horde-Mime-Viewer.spec +++ b/php-horde-Horde-Mime-Viewer.spec @@ -9,10 +9,12 @@ %{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Horde_Mime_Viewer %global pear_channel pear.horde.org +# To use system js +%global with_sysjs 0 Name: php-horde-Horde-Mime-Viewer Version: 2.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Horde MIME Viewer Library Group: Development/Libraries @@ -31,7 +33,11 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0 Requires(post): %{__pear} Requires(postun): %{__pear} +%if %{with_sysjs} Requires: syntaxhighlighter +%else +Provides: horde-syntaxhighlighter +%endif Requires: php(language) >= 5.3.0 Requires: php-date Requires: php-dom @@ -75,7 +81,9 @@ cd %{pear_name}-%{version} # Remove checksum for .mo, as we regenerate them sed -e '/%{pear_name}.po/d' \ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \ +%if %{with_sysjs} -e '/syntaxhighlighter/d' \ +%endif ../package.xml >%{name}.xml @@ -133,9 +141,16 @@ fi %{pear_testdir}/%{pear_name} %dir %{pear_datadir}/%{pear_name} %dir %{pear_datadir}/%{pear_name}/locale +%if ! %{with_sysjs} +%{pear_hordedir}/js/syntaxhighlighter +%endif %changelog +* Tue Sep 23 2014 Remi Collet - 2.0.7-2 +- don't use system syntaxhighlighter as this breaks horde + and its cache system + * Thu May 22 2014 Remi Collet - 2.0.7-1 - Update to 2.0.7 -- cgit