[packages/stikked] use system phpqrcode

[glen]

commit 276be165451fe8326658bf9ac2c51ff1121ab937
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Oct 9 13:50:48 2014 +0300

    use system phpqrcode

 stikked.spec           |  7 +++++--
 system-phpqrcode.patch | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/stikked.spec b/stikked.spec
index b315cf3..f562e9f 100644
--- a/stikked.spec
+++ b/stikked.spec
@@ -20,6 +20,7 @@ Source1:	apache.conf
 Source2:	lighttpd.conf
 Patch0:		config.patch
 Patch1:		system-geshi.patch
+Patch2:		system-phpqrcode.patch
 URL:		https://github.com/claudehohl/Stikked
 BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	php(core) >= %{php_min_version}
@@ -33,6 +34,7 @@ Requires:	webserver(alias)
 Requires:	webserver(indexfile)
 Requires:	webserver(php)
 Suggests:	php(gd)
+Suggests:	php-phpqrcode
 Suggests:	webserver(expires)
 Suggests:	webserver(rewrite)
 BuildArch:	noarch
@@ -72,12 +74,13 @@ rm htdocs/system/.htaccess
 mv htdocs/application/config .
 mv config/stikked.php{.dist,}
 
-# use system geshi package
+# use system packages
 rm -r htdocs/application/libraries/geshi
+rm -r htdocs/application/libraries/phpqrcode
 
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/system-phpqrcode.patch b/system-phpqrcode.patch
new file mode 100644
index 0000000..c38fc2d
--- /dev/null
+++ b/system-phpqrcode.patch
@@ -0,0 +1,11 @@
+--- Stikked-0.9.0/./htdocs/themes/default/views/view/qr.php~	2014-10-08 23:20:57.572987805 +0300
++++ Stikked-0.9.0/./htdocs/themes/default/views/view/qr.php	2014-10-09 13:10:54.636364691 +0300
+@@ -4,7 +4,7 @@
+  * Function list:
+  * Classes list:
+  */
+-require_once ('./application/libraries/phpqrcode/qrlib.php');
++require_once '/usr/share/php/phpqrcode/phpqrcode.php';
+ $qrurl = $url;
+ 
+ if ($snipurl != false) 
================================================================

---- gitweb:

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