packages: php-propel/php-propel.spec, php-propel/phing-classpath.patch (NEW...

[glen]

Author: glen                         Date: Tue Jan  4 13:42:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix locating of phing classes inside generator; rel 3

---- Files affected:
packages/php-propel:
   php-propel.spec (1.14 -> 1.15) , phing-classpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-propel/php-propel.spec
diff -u packages/php-propel/php-propel.spec:1.14 packages/php-propel/php-propel.spec:1.15
--- packages/php-propel/php-propel.spec:1.14	Tue Jan  4 08:44:34 2011
+++ packages/php-propel/php-propel.spec	Tue Jan  4 14:42:42 2011
@@ -4,11 +4,12 @@
 Summary(pl.UTF-8):	Usługa przechowywania i odpytywania obiektów dla PHP5
 Name:		php-%{pkgname}
 Version:	1.4.2
-Release:	2
+Release:	3
 License:	LGPL
 Group:		Development/Languages/PHP
 Source0:	http://files.propelorm.org/%{pkgname}-%{version}.tar.gz
 # Source0-md5:	37d0c260bac544d59308e40d4b67026c
+Patch0:	phing-classpath.patch
 URL:		http://www.propelorm.org/
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-common >= 4:5.2.8-3
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 cat <<'EOF'> generator/pear/pear-propel-gen.sh
 #!/bin/sh
 exec phing -f %{php_data_dir}/data/propel_generator/pear-build.xml -Dproject.dir=$*
@@ -96,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/01/04 13:42:42  glen
+- fix locating of phing classes inside generator; rel 3
+
 Revision 1.14  2011/01/04 07:44:34  glen
 - fix path to pear-build.xml; rel 2
 

================================================================
Index: packages/php-propel/phing-classpath.patch
diff -u /dev/null packages/php-propel/phing-classpath.patch:1.1
--- /dev/null	Tue Jan  4 14:42:47 2011
+++ packages/php-propel/phing-classpath.patch	Tue Jan  4 14:42:42 2011
@@ -0,0 +1,11 @@
+--- propel-1.4.2/generator/build-propel.xml~	2010-01-29 16:48:28.000000000 +0200
++++ propel-1.4.2/generator/build-propel.xml	2011-01-04 15:38:57.121865260 +0200
+@@ -37,7 +37,7 @@
+   -->
+ 
+   <path id="propelclasses">
+-    <pathelement dir="${propel.home}/classes/"/>
++    <pathelement dir="/usr/share/php"/>
+   </path>
+ 
+   <taskdef
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-propel/php-propel.spec?r1=1.14&r2=1.15&f=u