[php-horde-Horde-Mime-Viewer] don't use system syntaxhighlighter as this breaks horde and its cache system
Remi Collet
remi at fedoraproject.org
Wed Sep 24 05:10:53 UTC 2014
commit 6cc9f5d06abd251b2fd47491562a8ea8188b6777
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Sep 24 07:10:52 2014 +0200
don't use system syntaxhighlighter as this breaks horde and its cache system
php-horde-Horde-Mime-Viewer.spec | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/php-horde-Horde-Mime-Viewer.spec b/php-horde-Horde-Mime-Viewer.spec
index 5aac075..85793a3 100644
--- a/php-horde-Horde-Mime-Viewer.spec
+++ b/php-horde-Horde-Mime-Viewer.spec
@@ -10,6 +10,8 @@
%{!?__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
@@ -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,8 +81,11 @@ 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
+touch -r ../package.xml %{name}.xml
%build
@@ -127,9 +136,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 at fedoraproject.org> - 2.0.7-2
+- don't use system syntaxhighlighter as this breaks horde
+ and its cache system
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list