packages: php-facebook-athenaeum/php-facebook-athenaeum.spec, php-facebook-...

[glen]

Author: glen                         Date: Mon Dec 21 13:36:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- curl is optional
- remove pear based JSON for older php, force php 5.2

---- Files affected:
packages/php-facebook-athenaeum:
   php-facebook-athenaeum.spec (1.2 -> 1.3) , json-dep.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-facebook-athenaeum/php-facebook-athenaeum.spec
diff -u packages/php-facebook-athenaeum/php-facebook-athenaeum.spec:1.2 packages/php-facebook-athenaeum/php-facebook-athenaeum.spec:1.3
--- packages/php-facebook-athenaeum/php-facebook-athenaeum.spec:1.2	Mon Dec 21 14:23:42 2009
+++ packages/php-facebook-athenaeum/php-facebook-athenaeum.spec	Mon Dec 21 14:36:09 2009
@@ -1,24 +1,37 @@
 # $Revision$, $Date$
+%define		php_min_version 5.2
 Summary:	Tools to extend library services to Facebook users through Facebook applications
 Name:		php-facebook-athenaeum
 Version:	0.1.8
-Release:	0.3
+Release:	0.8
 License:	Apache v2.0
 Group:		Development/Languages/PHP
 Source0:	http://facebook-athenaeum.googlecode.com/files/fb-athenaeum-%{version}.tar.gz
 # Source0-md5:	a571a6ee843ebebb1740d42a14779783
 URL:		http://code.google.com/p/facebook-athenaeum/
 BuildRequires:	rpmbuild(macros) >= 1.461
-Requires:	php-common >= 4:5.0
-Requires:	php-curl
-Requires:	php-date
+Requires:	php-common >= 4:%{php_min_version}
+Patch0:		json-dep.patch
+#Requires:	php-date
 Requires:	php-hash
 Requires:	php-json
 Requires:	php-pcre
 Requires:	php-simplexml
+Suggests:	php-curl
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# bad depsolver
+%define		_noautopeardep	pear(facebookapi_php5_restlib.php)
+
+# exclude optional php dependencies
+%define		_noautophpreq	php(curl)
+
+# we don't want php(xxx) being resolved to php-xxx
+%define		_noautoreqdep	php(.*)
+
+%define		_noautoreq	%{_noautophpreq} %{_noautopeardep}
+
 %description
 Facebook Athenaeum provides libraries an easy to implement Facebook
 application to extend library resources to students in Facebook. The
@@ -29,6 +42,10 @@
 
 %prep
 %setup -q -n fb-athenaeum-%{version}
+%patch0 -p1
+
+# we depend on php 5.2
+rm -rf libs/facebook_api/jsonwrapper
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +65,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/12/21 13:36:09  glen
+- curl is optional
+- remove pear based JSON for older php, force php 5.2
+
 Revision 1.2  2009/12/21 13:23:42  glen
 - deps from php.req
 

================================================================
Index: packages/php-facebook-athenaeum/json-dep.patch
diff -u /dev/null packages/php-facebook-athenaeum/json-dep.patch:1.1
--- /dev/null	Mon Dec 21 14:36:15 2009
+++ packages/php-facebook-athenaeum/json-dep.patch	Mon Dec 21 14:36:09 2009
@@ -0,0 +1,10 @@
+--- fb-athenaeum-0.1.8/libs/facebook_api/facebookapi_php5_restlib.php~	2008-12-19 23:32:27.000000000 +0200
++++ fb-athenaeum-0.1.8/libs/facebook_api/facebookapi_php5_restlib.php	2009-12-21 15:21:56.537884420 +0200
+@@ -31,7 +31,6 @@
+ // +---------------------------------------------------------------------------+
+ //
+ 
+-include_once 'jsonwrapper/jsonwrapper.php';
+ class FacebookRestClient {
+   public $secret;
+   public $session_key;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-facebook-athenaeum/php-facebook-athenaeum.spec?r1=1.2&r2=1.3&f=u