[packages/php-propel/dev-1.7] 1.7.1

[glen]

commit 26deaa22b81b6ccfdc54a1eb7b55339f65408b16
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 26 02:22:24 2014 +0300

    1.7.1

 phing-classpath.patch | 19 +++++++++----------
 php-propel.spec       | 46 ++++++++++++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 28 deletions(-)
---
diff --git a/php-propel.spec b/php-propel.spec
index ae5cd67..5d4d297 100644
--- a/php-propel.spec
+++ b/php-propel.spec
@@ -3,21 +3,20 @@
 Summary:	Object persistence and query service for PHP5
 Summary(pl.UTF-8):	Usługa przechowywania i odpytywania obiektów dla PHP5
 Name:		php-%{pkgname}
-Version:	1.4.2
-Release:	9
-License:	LGPL v3
+Version:	1.7.1
+Release:	0.1
+License:	MIT
 Group:		Development/Languages/PHP
-Source0:	http://files.propelorm.org/%{pkgname}-%{version}.tar.gz
-# Source0-md5:	37d0c260bac544d59308e40d4b67026c
+Source0:	http://files.propelorm.org/propel-%{version}.tar.gz
+# Source0-md5:	5a56592ffb09e59e2cd92381da07e181
 Patch0:		phing-classpath.patch
-Patch1:		mysql-type-deprecation.patch
-URL:		http://trac.propelorm.org/wiki/Documentation/1.4
+URL:		http://propelorm.org/Propel/
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php(core) >= %{php_min_version}
+Requires:	php(date)
 Requires:	php(pcre)
 Requires:	php(pdo)
 Requires:	php(spl)
-Requires:	php-date
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,12 +39,12 @@ Summary:	propel-gen - DDL files generator
 Summary(pl.UTF-8):	propel-gen - generator plików DDL
 Group:		Development/Languages/PHP
 Requires:	php(core) >= %{php_min_version}
+Requires:	php(date)
 Requires:	php(dom)
 Requires:	php(pcre)
 Requires:	php(simplexml)
 Requires:	php(tokenizer)
 Requires:	php(xsl)
-Requires:	php-date
 Requires:	php-phing >= 2.3.3
 
 %description -n propel-gen
@@ -55,9 +54,9 @@ A generator that creates SQL definition files (DDL).
 Generator tworzący pliki definicji SQL (DDL).
 
 %prep
-%setup -q -n %{pkgname}-%{version}
+%setup -qc
+mv propelorm-Propel-*/* .
 %patch0 -p1
-%patch1 -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=$*
@@ -66,10 +65,9 @@ EOF
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_data_dir}/propel,%{_bindir}}
-cp -a runtime/classes/propel/* $RPM_BUILD_ROOT%{php_data_dir}/propel
+cp -a runtime/lib/* $RPM_BUILD_ROOT%{php_data_dir}/propel
 
-cp -a generator/classes/propel/engine $RPM_BUILD_ROOT%{php_data_dir}/propel
-cp -a generator/classes/propel/phing $RPM_BUILD_ROOT%{php_data_dir}/propel
+cp -a generator/lib/* $RPM_BUILD_ROOT%{php_data_dir}/propel
 install -p generator/pear/pear-propel-gen.sh $RPM_BUILD_ROOT%{_bindir}/propel-gen
 install -d $RPM_BUILD_ROOT%{php_data_dir}/data/propel_generator
 cp -a generator/{resources,build-propel.xml,*.properties} $RPM_BUILD_ROOT%{php_data_dir}/data/propel_generator
@@ -80,10 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc WHATS_NEW CHANGELOG
+%doc README.md CHANGELOG INSTALL LICENSE
 %dir %{php_data_dir}/propel
 %{php_data_dir}/propel/Propel.php
-%{php_data_dir}/propel/PropelException.php
 %{php_data_dir}/propel/adapter
 %{php_data_dir}/propel/logger
 %{php_data_dir}/propel/map
@@ -91,11 +88,24 @@ rm -rf $RPM_BUILD_ROOT
 %{php_data_dir}/propel/util
 %{php_data_dir}/propel/validator
 
+# figure where really, and isolate runtime and builder again
+%{php_data_dir}/propel/behavior
+%{php_data_dir}/propel/builder
+%{php_data_dir}/propel/collection
+%{php_data_dir}/propel/config
+%{php_data_dir}/propel/connection
+%{php_data_dir}/propel/exception
+%{php_data_dir}/propel/formatter
+%{php_data_dir}/propel/model
+%{php_data_dir}/propel/parser
+%{php_data_dir}/propel/platform
+%{php_data_dir}/propel/query
+%{php_data_dir}/propel/reverse
+%{php_data_dir}/propel/task
+
 %files -n propel-gen
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/propel-gen
-%{php_data_dir}/propel/engine
-%{php_data_dir}/propel/phing
 
 # XXX temp fix:
 %dir %{php_data_dir}/data
diff --git a/phing-classpath.patch b/phing-classpath.patch
index 3129cbe..352ea2e 100644
--- a/phing-classpath.patch
+++ b/phing-classpath.patch
@@ -1,11 +1,10 @@
---- 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 @@
-   -->
+--- php-propel-1.7.1/generator/build-propel.xml~	2014-02-25 11:13:58.000000000 +0200
++++ php-propel-1.7.1/generator/build-propel.xml	2014-04-26 02:15:15.371163900 +0300
+@@ -37,6 +37,7 @@
+     -->
  
-   <path id="propelclasses">
--    <pathelement dir="${propel.home}/classes/"/>
-+    <pathelement dir="/usr/share/php"/>
-   </path>
- 
-   <taskdef
+     <path id="propelclasses">
++        <pathelement dir="/usr/share/php"/>
+         <pathelement dir="${propel.home}/lib/"/>
+         <pathelement dir="${propel.project.dir}/"/>
+     </path>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-propel.git/commitdiff/26deaa22b81b6ccfdc54a1eb7b55339f65408b16