[php-doctrine-Doctrine] upstream 1.2.3

[Christof Damian]

commit 2fd32d6a20ce26eec4ee2b688497de6f2ce836ef
Author: Christof Damian <christof at damian.net>
Date:   Tue Aug 24 23:14:28 2010 +0200

    upstream 1.2.3

 .gitignore                 |    1 +
 php-doctrine-Doctrine.spec |   24 ++++++++++++++----------
 sources                    |    2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3942ef8..1874e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Doctrine-1.2.2.tgz
+/Doctrine-1.2.3.tgz
diff --git a/php-doctrine-Doctrine.spec b/php-doctrine-Doctrine.spec
index b8104ed..b394de0 100644
--- a/php-doctrine-Doctrine.spec
+++ b/php-doctrine-Doctrine.spec
@@ -2,7 +2,7 @@
 %global pear_name Doctrine
 
 Name:           php-doctrine-Doctrine
-Version:        1.2.2
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        PHP Object Relational Mapper
 
@@ -16,7 +16,7 @@ BuildArch:      noarch
 BuildRequires:  php-channel(pear.doctrine-project.org)
 BuildRequires:  php-pear(PEAR)
 Requires:       php >= 5.2.3
-Requires:       php-pear(PEAR) >= 1.3.6
+Requires:       php-pear(PEAR) >= 1.6.0
 Requires:       php-channel(pear.doctrine-project.org)
 Requires:       php-pdo
 Requires(post): %{__pear}
@@ -35,7 +35,7 @@ without requiring unnecessary code duplication.
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -47,11 +47,11 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/LICENSE docdir
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
     pear.phpdoctrine.org/%{pear_name} >/dev/null || :
 
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -83,13 +83,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/%{pear_name}
+%doc %{pear_name}-%{version}/docdir/*
+%{pear_xmldir}/%{name}.xml
 # Expand this as needed to avoid owning dirs owned by our dependencies
+%{pear_phpdir}/%{pear_name}.php
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Tue Aug 24 2010 Christof Damian <christof at damian.net> - 1.2.3-1
+- upstream 1.2.3
+- upstream removed doc & test directory
+
 * Sun Apr  4 2010 Christof Damian <christof at damian.net> - 1.2.2-1
 - upstream 1.2.2
 - change to new channel name & url
diff --git a/sources b/sources
index 5ded34b..9e1f2ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a82734fad4476da2d42def97c5e7c898  Doctrine-1.2.2.tgz
+3938c9655d9f62df30a34638c9930ab2  Doctrine-1.2.3.tgz