summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-09-23 15:15:00 +0200
committerRemi Collet <fedora@famillecollet.com>2014-09-23 15:15:00 +0200
commitfaa2dc574be3d56a0ad74c001fcfb99ee7bb0f98 (patch)
tree1c73dffe4c583e725252f8dc03724b457c723b90
parent9388dd88751e04a188023b382a96b9ed7af95d2b (diff)
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
-rw-r--r--php-horde-Horde-Mime-Viewer.spec17
1 files changed, 16 insertions, 1 deletions
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 <remi@fedoraproject.org> - 2.0.7-2
+- don't use system syntaxhighlighter as this breaks horde
+ and its cache system
+
* Thu May 22 2014 Remi Collet <remi@fedoraproject.org> - 2.0.7-1
- Update to 2.0.7