packages: php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec, php-pea...

[glen]

Author: glen                         Date: Tue Jan 26 07:38:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix paths for pear dep generator
- move doc to examples; rel 2

---- Files affected:
packages/php-pear-Genealogy_Gedcom:
   php-pear-Genealogy_Gedcom.spec (1.1 -> 1.2) , peardeps.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec
diff -u packages/php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec:1.1 packages/php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec:1.2
--- packages/php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec:1.1	Sat Oct 11 11:32:11 2008
+++ packages/php-pear-Genealogy_Gedcom/php-pear-Genealogy_Gedcom.spec	Tue Jan 26 08:37:57 2010
@@ -8,11 +8,12 @@
 Summary(pl.UTF-8):	%{_pearname} - parser Gedcom
 Name:		php-pear-%{_pearname}
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	PHP License
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	113e819410248f30f0792b0d60ad8bb4
+Patch0:	peardeps.patch
 URL:		http://pear.php.net/package/Genealogy_Gedcom/
 BuildRequires:	php-pear-PEAR
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
@@ -32,28 +33,37 @@
 
 %prep
 %pear_package_setup
+%patch0 -p1
+mv docs/%{_pearname}/examples .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}
+install -d $RPM_BUILD_ROOT{%{php_pear_dir},%{_examplesdir}/%{name}-%{version}}
 %pear_package_install
 
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc install.log docs/Genealogy_Gedcom/examples/example1.php
+%doc install.log
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/Genealogy/Gedcom
 %{php_pear_dir}/Genealogy/Gedcom.php
 
+%{_examplesdir}/%{name}-%{version}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/01/26 07:37:57  glen
+- fix paths for pear dep generator
+- move doc to examples; rel 2
+
 Revision 1.1  2008/10/11 09:32:11  adamg
 - new
-

================================================================
Index: packages/php-pear-Genealogy_Gedcom/peardeps.patch
diff -u /dev/null packages/php-pear-Genealogy_Gedcom/peardeps.patch:1.1
--- /dev/null	Tue Jan 26 08:38:02 2010
+++ packages/php-pear-Genealogy_Gedcom/peardeps.patch	Tue Jan 26 08:37:57 2010
@@ -0,0 +1,28 @@
+--- Genealogy_Gedcom-1.0.1/usr/share/pear/Genealogy/Gedcom/Parser.php~	2010-01-26 09:34:28.000000000 +0200
++++ Genealogy_Gedcom-1.0.1/usr/share/pear/Genealogy/Gedcom/Parser.php	2010-01-26 09:35:27.626682588 +0200
+@@ -31,10 +31,10 @@
+ // $Id$
+ //
+ 
+-require_once 'Individual.php';
+-require_once 'Family.php';
+-require_once 'Object.php';
+-require_once 'Header.php';
++require_once 'Genealogy/Gedcom/Individual.php';
++require_once 'Genealogy/Gedcom/Family.php';
++require_once 'Genealogy/Gedcom/Object.php';
++require_once 'Genealogy/Gedcom/Header.php';
+ 
+ /**
+  * Genealogy_Parser
+--- Genealogy_Gedcom-1.0.1/usr/share/pear/Genealogy/Gedcom.php~	2010-01-26 09:36:02.000000000 +0200
++++ Genealogy_Gedcom-1.0.1/usr/share/pear/Genealogy/Gedcom.php	2010-01-26 09:36:49.170008589 +0200
+@@ -31,7 +31,7 @@
+ // $Id$
+ //
+ 
+-require_once 'Gedcom/Parser.php';
++require_once 'Genealogy/Gedcom/Parser.php';
+ 
+ /**
+  * Genealogy_Gedcom
================================================================

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