packages: jpgraph/jpgraph-config.patch, jpgraph/jpgraph.spec - up to 3.0.6

[arekm]

Author: arekm                        Date: Tue Dec 22 12:04:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.6

---- Files affected:
packages/jpgraph:
   jpgraph-config.patch (1.3 -> 1.4) , jpgraph.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/jpgraph/jpgraph-config.patch
diff -u packages/jpgraph/jpgraph-config.patch:1.3 packages/jpgraph/jpgraph-config.patch:1.4
--- packages/jpgraph/jpgraph-config.patch:1.3	Mon Jun 15 16:37:11 2009
+++ packages/jpgraph/jpgraph-config.patch	Tue Dec 22 13:04:14 2009
@@ -1,20 +1,21 @@
 --- jpgraph-2.3.4/src/jpg-config.inc.php~	2009-06-15 17:35:46.000000000 +0300
 +++ jpgraph-2.3.4/src/jpg-config.inc.php	2009-06-15 17:36:32.632029137 +0300
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
  //
  //------------------------------------------------------------------------
- // define("CACHE_DIR","/tmp/jpgraph_cache/");
--// define("TTF_DIR","/usr/share/fonts/truetype/");
-+DEFINE("TTF_DIR","/usr/share/fonts/TTF/");
- // define("MBTTF_DIR","/usr/share/fonts/ja/TrueType/");
+ // define('CACHE_DIR','/tmp/jpgraph_cache/');
+-// define('TTF_DIR','/usr/share/fonts/truetype/');
++define('TTF_DIR','/usr/share/fonts/TTF/');
+ // define('MBTTF_DIR','/usr/share/fonts/truetype/');
  
  //-------------------------------------------------------------------------
-@@ -196,7 +196,7 @@
+@@ -123,7 +123,7 @@
  // Please note that the Apache user must be a member of the
  // specified group since otherwise it is impossible for Apache
  // to set the specified group.
--define("CACHE_FILE_GROUP","wwwadmin");
-+DEFINE("CACHE_FILE_GROUP","http");
+-define('CACHE_FILE_GROUP','www');
++define('CACHE_FILE_GROUP','http');
  
  // What permissions should the cached file have
- // (Set to "" will give the default persmissions for the "PHP-user")
+ // (Set to '' will give the default persmissions for the 'PHP-user')
+

================================================================
Index: packages/jpgraph/jpgraph.spec
diff -u packages/jpgraph/jpgraph.spec:1.19 packages/jpgraph/jpgraph.spec:1.20
--- packages/jpgraph/jpgraph.spec:1.19	Mon Jun 15 19:57:16 2009
+++ packages/jpgraph/jpgraph.spec	Tue Dec 22 13:04:14 2009
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
 Summary:	Class for creating esientific and business charts, works with php5
 Summary(pl.UTF-8):	Klasa do tworzenia naukowych i biznesowych wykresów, działa z php5
-Name:		jpgraph2
-Version:	2.3.4
-Release:	4
+Name:		jpgraph
+Version:	3.0.6
+Release:	1
 License:	QPL 1.0
 Group:		Libraries
 # Source0Download: http://www.aditus.nu/jpgraph/jpdownload.php
-Source0:	http://hem.bredband.net/jpgraph2/jpgraph-%{version}.tar.gz
-# Source0-md5:	4500906d756dc395a992866e483591ae
+Source0:	http://hem.bredband.net/jpgraph2/%{name}-%{version}.tar.bz2
+# Source0-md5:	7af412c576b70b65480c02f7e837fdc8
 Patch0:		%{name}-config.patch
 URL:		http://www.aditus.nu/jpgraph/
 BuildRequires:	sed >= 4.0
@@ -41,12 +41,9 @@
 Uwaga: wersje 2.x są tylko dla PHP5, nie będą działać z PHP4.
 
 %prep
-%setup  -q -n jpgraph-%{version}
+%setup -q -c
 %patch0 -p1
 
-%{__sed} -i -e 's#img/img/img/img/img/img/#img/#g' docs/html/*.html
-%{__sed} -i -e 's#\.\./#../img/#g' docs/html/*/*.html
-
 mv src/Examples .
 
 %{__sed} -i -e 's,include ("../\(.*\)");,require_once "jpgraph2/\1";,' Examples/*.php
@@ -67,7 +64,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README* docs/*
+%doc README* docportal/*
 %{_appdir}
 %{_examplesdir}/%{name}-%{version}
 
@@ -77,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2009/12/22 12:04:14  arekm
+- up to 3.0.6
+
 Revision 1.19  2009/06/15 17:57:16  glen
 - update for missing files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jpgraph/jpgraph-config.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jpgraph/jpgraph.spec?r1=1.19&r2=1.20&f=u