[packages/stikked] use system geshi package

[glen]

commit e77e78afd788e58d4c42ae24325a6908b20618a2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 29 13:34:35 2014 +0200

    use system geshi package

 stikked.spec       |  9 +++++++--
 system-geshi.patch | 11 +++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/stikked.spec b/stikked.spec
index f9bbdd7..e12fdec 100644
--- a/stikked.spec
+++ b/stikked.spec
@@ -1,5 +1,3 @@
-# TODO
-# - system geshi
 %define		php_min_version 5.2.4
 Summary:	Stikked is an Open-Source PHP Pastebin
 Name:		stikked
@@ -12,12 +10,14 @@ Source0:	https://github.com/claudehohl/Stikked/archive/%{version}/%{name}-%{vers
 Source1:	apache.conf
 Source2:	lighttpd.conf
 Patch0:		config.patch
+Patch1:		system-geshi.patch
 URL:		https://github.com/claudehohl/Stikked
 BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(mysql)
 Requires:	php(pcre)
 Requires:	php(xml)
+Requires:	php-geshi >= 1.0.8.11
 Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
@@ -63,7 +63,12 @@ rm htdocs/system/.htaccess
 mv htdocs/application/config .
 mv config/stikked.php{.dist,}
 
+# use system geshi package
+rm -r htdocs/application/libraries/geshi
+
 %patch0 -p1
+%patch1 -p1
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/system-geshi.patch b/system-geshi.patch
new file mode 100644
index 0000000..6a0512a
--- /dev/null
+++ b/system-geshi.patch
@@ -0,0 +1,11 @@
+--- Stikked-0.8.6/./htdocs/application/libraries/process.php~	2014-03-29 13:29:38.000000000 +0200
++++ Stikked-0.8.6/./htdocs/application/libraries/process.php	2014-03-29 13:31:04.566011897 +0200
+@@ -9,7 +9,7 @@
+ *
+ */
+ 
+-include_once('geshi/geshi.php');
++require_once 'geshi.php';
+ 
+ /** 
+ * Source code processing class / Geshi Wrapper
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/stikked.git/commitdiff/de924a04540863d498ebe2fcd3bbd102f40e303f