php-doctrine-dbal: import from rawhide

2 files changed, 147 insertions, 0 deletions

diff --git a/php-doctrine-dbal-2.4.2-primary_index.patch b/php-doctrine-dbal-2.4.2-primary_index.patch
new file mode 100644
index 0000000..49d46a0
--- /dev/null
+++ b/php-doctrine-dbal-2.4.2-primary_index.patch
@@ -0,0 +1,32 @@
+From 1d729298ee9464e03a4695f2df0e63b15d10874c Mon Sep 17 00:00:00 2001
+From: Bart Visscher <bartv@thisnet.nl>
+Date: Thu, 18 Jul 2013 20:19:32 +0200
+Subject: [PATCH] When changing from a non-primary index to a primary index,
+ the dropped index isnt named PRIMARY
+
+---
+ doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+index 8050e1f..d77b974 100644
+--- a/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
++++ b/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+@@ -512,6 +512,15 @@ protected function getPreAlterTableIndexForeignKeySQL(TableDiff $diff)
+                 }
+             }
+         }
++        foreach ($diff->changedIndexes as $changedKey => $changedIndex) {
++            if ($changedIndex->isPrimary() && $changedKey != 'PRIMARY') {
++                $index = $diff->changedIndexes[$changedKey];
++                $index = new index($changedKey, $index->getColumns(), $index->isUnique(), false);
++                $diff->removedIndexes[$changedKey] = $index;
++                $diff->addedIndexes['PRIMARY'] = $diff->changedIndexes[$changedKey];
++                unset($diff->changedIndexes[$changedKey]);
++            }
++        }
+ 
+         $sql = array_merge($sql, parent::getPreAlterTableIndexForeignKeySQL($diff));
+ 
+-- 
+1.8.5.1
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
new file mode 100644
index 0000000..d8a9426
--- /dev/null
+++ b/php-doctrine-dbal.spec
@@ -0,0 +1,115 @@
+%global github_owner   doctrine
+%global github_name    dbal
+%global github_version 2.4.2
+%global github_commit  fec965d330c958e175c39e61c3f6751955af32d0
+
+# "php": ">=5.3.2"
+%global php_min_ver             5.3.2
+# "doctrine/common": "~2.4"
+%global doctrine_common_min_ver 2.4
+%global doctrine_common_max_ver 3.0
+# "symfony/console": "~2.0"
+%global symfony_console_min_ver 2.0
+%global symfony_console_max_ver 3.0
+
+Name:      php-%{github_owner}-%{github_name}
+Version:   %{github_version}
+Release:   2%{?github_release}%{?dist}
+Summary:   Doctrine Database Abstraction Layer (DBAL)
+
+Group:     Development/Libraries
+License:   MIT
+URL:       http://www.doctrine-project.org/projects/dbal.html
+Source0:   https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+# From OwnCloud. Committed upstream as
+# https://github.com/doctrine/dbal/commit/075c68b7518e27d46d7f700a1d42ebf43f6ebdfd
+# but immediately reverted in
+# https://github.com/doctrine/dbal/commit/894493b285c71a33e6ed29994ba415bad5e0a457
+Patch0:    php-doctrine-dbal-2.4.2-primary_index.patch
+
+BuildArch: noarch
+
+Requires:  php(language)       >= %{php_min_ver}
+Requires:  php-doctrine-common >= %{doctrine_common_min_ver}
+Requires:  php-doctrine-common <  %{doctrine_common_max_ver}
+Requires:  php-symfony-console >= %{symfony_console_min_ver}
+Requires:  php-symfony-console <  %{symfony_console_max_ver}
+# phpcompatinfo (computed from v2.4.2)
+Requires:  php-date
+Requires:  php-json
+Requires:  php-pcre
+Requires:  php-pdo
+Requires:  php-spl
+
+# PEAR
+Provides:  php-pear(pear.doctrine-project.org/DoctrineDBAL) = %{version}
+# Rename
+Obsoletes: php-doctrine-DoctrineDBAL < %{version}
+Provides:  php-doctrine-DoctrineDBAL = %{version}
+
+%description
+The Doctrine database abstraction & access layer (DBAL) offers a lightweight
+and thin runtime layer around a PDO-like API and a lot of additional, horizontal
+features like database schema introspection and manipulation through an OO API.
+
+The fact that the Doctrine DBAL abstracts the concrete PDO API away through the
+use of interfaces that closely resemble the existing PDO API makes it possible
+to implement custom drivers that may use existing native or self-made APIs. For
+example, the DBAL ships with a driver for Oracle databases that uses the oci8
+extension under the hood.
+
+
+%prep
+%setup -q -n %{github_name}-%{github_commit}
+%patch0 -p3 -b .primary_index
+
+# Make a single executable
+echo '#!%{_bindir}/php' > bin/doctrine-dbal
+sed 's#Doctrine/Common/ClassLoader.php#%{_datadir}/php/Doctrine/Common/ClassLoader.php#' \
+    bin/doctrine-dbal.php >> bin/doctrine-dbal
+
+# Remove empty file
+rm -f lib/Doctrine/DBAL/README.markdown
+
+# Remove executable bits
+chmod a-x \
+    lib/Doctrine/DBAL/Types/JsonArrayType.php \
+    lib/Doctrine/DBAL/Types/SimpleArrayType.php
+
+
+%build
+# Empty build section, nothing required
+
+
+%install
+mkdir -p %{buildroot}/%{_datadir}/php
+cp -rp lib/Doctrine %{buildroot}/%{_datadir}/php/
+
+mkdir -p %{buildroot}/%{_bindir}
+install -pm 0755 bin/doctrine-dbal %{buildroot}/%{_bindir}/
+
+
+%check
+# No upstream tests provided in source
+
+
+%files
+%doc LICENSE *.md UPGRADE composer.json
+%{_datadir}/php/Doctrine/DBAL
+%{_bindir}/doctrine-dbal
+
+
+%changelog
+* Tue Jan 07 2014 Adam Williamson <awilliam@redhat.com> - 2.4.2-2
+- primary_index: one OwnCloud patch still isn't in upstream
+
+* Sat Jan 04 2014 Shawn Iwinski <shawn.iwinski@gmail.com> 2.4.2-1
+- Updated to 2.4.2
+- Conditional %%{?dist}
+
+* Tue Dec 31 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.4.1-2.20131231gitd08b11c
+- Updated to latest snapshot
+- Removed patches (pulled into latest snapshot)
+
+* Sun Dec 29 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.4.1-1
+- Initial package