backport stuff

4 files changed, 51 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13af741
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
+
diff --git a/phpdoc-get-source.sh b/phpdoc-get-source.sh
index b2ac62b..3947de4 100755
--- a/phpdoc-get-source.sh
+++ b/phpdoc-get-source.sh
@@ -55,6 +55,7 @@ pushd $TEMP_DIR
     pushd $GIT_DIR
         print "Checking out commit..."
         $GIT checkout $GIT_COMMIT
+        cp composer.json ${SPEC_DIR}/composer.json
     popd
 
     TAR_DIR=${GIT_NAME}-${GIT_COMMIT}
diff --git a/phpdoc.spec b/phpdoc.spec
index a244227..a5a5a26 100644
--- a/phpdoc.spec
+++ b/phpdoc.spec
@@ -1,3 +1,4 @@
+# remirepo spec file for phpdoc, from
 #
 # Fedora spec file for phpdoc
 #
@@ -279,22 +280,14 @@ BuildRequires: php-composer(phpdocumentor/reflection-docblock) <  %{phpdocumento
 BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
 BuildRequires: php-composer(phpdocumentor/reflection) <  %{phpdocumentor_reflection_max_ver}
 BuildRequires: php-composer(phpdocumentor/reflection) >= %{phpdocumentor_reflection_min_ver}
-BuildRequires: php-composer(symfony/config) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/config) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/console) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/event-dispatcher) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/expression-language) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/expression-language) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/process) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/process) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/stopwatch) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/stopwatch) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/validator) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/validator) >= %{symfony_min_ver}
-BuildRequires: php-composer(twig/twig) <  %{twig_max_ver}
-BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
+BuildRequires: php-symfony-config >= %{symfony_min_ver}
+BuildRequires: php-symfony-console >= %{symfony_min_ver}
+BuildRequires: php-symfony-event-dispatcher >= %{symfony_min_ver}
+BuildRequires: php-symfony-expression-language >= %{symfony_min_ver}
+BuildRequires: php-symfony-process >= %{symfony_min_ver}
+BuildRequires: php-symfony-stopwatch >= %{symfony_min_ver}
+BuildRequires: php-symfony-validator >= %{symfony_min_ver}
+BuildRequires: php-twig >= %{twig_min_ver}
 BuildRequires: php-composer(zendframework/zend-cache) <  %{zendframework_cache_max_ver}
 BuildRequires: php-composer(zendframework/zend-cache) >= %{zendframework_cache_min_ver}
 BuildRequires: php-composer(zendframework/zend-config) <  %{zendframework_config_max_ver}
@@ -373,20 +366,13 @@ Requires:      php-composer(phpdocumentor/reflection) <  %{phpdocumentor_reflect
 Requires:      php-composer(phpdocumentor/reflection) >= %{phpdocumentor_reflection_min_ver}
 Requires:      php-composer(phpdocumentor/reflection-docblock) <  %{phpdocumentor_reflection_docblock_max_ver}
 Requires:      php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
-Requires:      php-composer(symfony/config) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/config) >= %{symfony_min_ver}
-Requires:      php-composer(symfony/console) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/console) >= %{symfony_min_ver}
-Requires:      php-composer(symfony/event-dispatcher) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/event-dispatcher) >= %{symfony_min_ver}
-Requires:      php-composer(symfony/process) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/process) >= %{symfony_min_ver}
-Requires:      php-composer(symfony/stopwatch) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/stopwatch) >= %{symfony_min_ver}
-Requires:      php-composer(symfony/validator) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/validator) >= %{symfony_min_ver}
-Requires:      php-composer(twig/twig) <  %{twig_max_ver}
-Requires:      php-composer(twig/twig) >= %{twig_min_ver}
+Requires:      php-symfony-config >= %{symfony_min_ver}
+Requires:      php-symfony-console >= %{symfony_min_ver}
+Requires:      php-symfony-event-dispatcher >= %{symfony_min_ver}
+Requires:      php-symfony-process >= %{symfony_min_ver}
+Requires:      php-symfony-stopwatch >= %{symfony_min_ver}
+Requires:      php-symfony-validator >= %{symfony_min_ver}
+Requires:      php-twig >= %{twig_min_ver}
 Requires:      php-composer(zendframework/zend-cache) <  %{zendframework_cache_max_ver}
 Requires:      php-composer(zendframework/zend-cache) >= %{zendframework_cache_min_ver}
 Requires:      php-composer(zendframework/zend-config) <  %{zendframework_config_max_ver}
@@ -630,13 +616,28 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     '%{phpdir}/Symfony/Component/Stopwatch/autoload.php',
     '%{phpdir}/Symfony/Component/Validator/autoload.php',
     '%{phpdir}/Twig/autoload.php',
-    '%{phpdir}/Zend/Cache/autoload.php',
-    '%{phpdir}/Zend/Config/autoload.php',
-    '%{phpdir}/Zend/Filter/autoload.php',
-    '%{phpdir}/Zend/I18n/autoload.php',
-    '%{phpdir}/Zend/Serializer/autoload.php',
-    '%{phpdir}/Zend/ServiceManager/autoload.php',
-    '%{phpdir}/Zend/Stdlib/autoload.php',
+    [
+        '%{phpdir}/Zend/Cache/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/Config/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/Filter/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/I18n/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/Serializer/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/ServiceManager/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ], [
+        '%{phpdir}/Zend/Stdlib/autoload.php',
+        '%{phpdir}/Zend/autoload.php',
+    ],
 ));
 AUTOLOAD