packages: php-propel/php-propel.spec - new domain, switch to one tarball build

[glen]

Author: glen                         Date: Fri Oct 29 08:58:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new domain, switch to one tarball build

---- Files affected:
packages/php-propel:
   php-propel.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/php-propel/php-propel.spec
diff -u packages/php-propel/php-propel.spec:1.11 packages/php-propel/php-propel.spec:1.12
--- packages/php-propel/php-propel.spec:1.11	Wed Mar 10 16:01:13 2010
+++ packages/php-propel/php-propel.spec	Fri Oct 29 10:58:13 2010
@@ -1,16 +1,15 @@
 # $Revision$, $Date$
+%define		pkgname	propel
 Summary:	Object persistence and query service for PHP5
 Summary(pl.UTF-8):	Usługa przechowywania i odpytywania obiektów dla PHP5
-Name:		php-propel
+Name:		php-%{pkgname}
 Version:	1.4.1
-Release:	1
+Release:	2
 License:	LGPL
 Group:		Development/Languages/PHP
-Source0:	http://pear.phpdb.org/get/propel_runtime-%{version}.tgz
-# Source0-md5:	6b5bc4b88f9a24068ef4176bdee77435
-Source1:	http://pear.phpdb.org/get/propel_generator-%{version}.tgz
-# Source1-md5:	d7bfb462fd94648c80b9f98bd9f192c7
-URL:		http://propel.phpdb.org/
+Source0:	http://files.propelorm.org/%{pkgname}-%{version}.tar.gz
+# Source0-md5:	aec7bef13252663e5ff0754582bd58f8
+URL:		http://www.propelorm.org/
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-common >= 4:5.2.8-3
 Requires:	php-creole
@@ -45,10 +44,7 @@
 Generator tworzący pliki definicji SQL (DDL).
 
 %prep
-%setup -qc -a1
-mv propel_generator-%{version} generator
-mv propel_runtime-%{version} runtime
-%{__sed} -i -e 's, at DATA-DIR@,%{php_data_dir}/data,g' generator/pear/pear-propel-gen
+%setup -q -n %{pkgname}-%{version}
 cat <<'EOF'> generator/pear/pear-propel-gen.sh
 #!/bin/sh
 exec phing -f %{php_pear_dir}/data/propel_generator/pear-build.xml -Dproject.dir=$*
@@ -57,13 +53,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_data_dir}/propel,%{_bindir}}
-cp -a runtime/* $RPM_BUILD_ROOT%{php_data_dir}/propel
+cp -a runtime/classes/propel/* $RPM_BUILD_ROOT%{php_data_dir}/propel
 
-cp -a generator/engine $RPM_BUILD_ROOT%{php_data_dir}/propel
-cp -a generator/phing $RPM_BUILD_ROOT%{php_data_dir}/propel
-install generator/pear/pear-propel-gen.sh $RPM_BUILD_ROOT%{_bindir}/propel-gen
+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
+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,*.xml,*.properties} $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
+cp -a generator/pear/{pear-build.xml,*.properties} $RPM_BUILD_ROOT%{php_data_dir}/data/propel_generator
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/10/29 08:58:13  glen
+- new domain, switch to one tarball build
+
 Revision 1.11  2010/03/10 15:01:13  glen
 - update to 1.4.1
 
================================================================

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