Update to 2.5.2

switch to symfony package names
open https://github.com/pdepend/pdepend/issues/357 missing changelog

2 files changed, 24 insertions, 27 deletions

diff --git a/composer.json b/composer.json
index 1c2bc69..d4bacec 100644
--- a/composer.json
+++ b/composer.json
@@ -4,9 +4,9 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": ">=5.3.7",
-        "symfony/dependency-injection": "^2.3.0|^3",
-        "symfony/filesystem": "^2.3.0|^3",
-        "symfony/config": "^2.3.0|^3"
+        "symfony/dependency-injection": "^2.3.0|^3|^4",
+        "symfony/filesystem": "^2.3.0|^3|^4",
+        "symfony/config": "^2.3.0|^3|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.7",
diff --git a/php-pdepend-PHP-Depend.spec b/php-pdepend-PHP-Depend.spec
index 0410ece..f78e805 100644
--- a/php-pdepend-PHP-Depend.spec
+++ b/php-pdepend-PHP-Depend.spec
@@ -7,7 +7,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a479c5204d761d15c506e31ecea8964aa922cfa2
+%global gh_commit    4388d7ba40ffc371520a7e2d754c55a66bcdb8dc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     pdepend
 %global gh_project   pdepend
@@ -18,17 +18,15 @@
 %global with_tests   0%{!?_without_tests:1}
 
 %if 0%{?fedora} >= 27 || "%{?vendor}" == "Remi Collet"
-%global sym_min  3
-%global sym_max  4
+%global sym_pref php-symfony3
 %global sym_path %{_datadir}/php/Symfony3
 %else
-%global sym_min  2.3
-%global sym_max  3
+%global sym_pref php-symfony
 %global sym_path %{_datadir}/php/Symfony
 %endif
 
 Name:           php-pdepend-PHP-Depend
-Version:        2.5.1
+Version:        2.5.2
 Release:        1%{?dist}
 Summary:        PHP_Depend design quality metrics for PHP package
 
@@ -49,12 +47,9 @@ BuildArch:      noarch
 #        "squizlabs/php_codesniffer": "^2.0.0"
 BuildRequires:  php-composer(phpunit/phpunit) >= 4.8
 BuildRequires:  php(language) >= 5.3.7
-BuildRequires:  php-composer(symfony/dependency-injection) <  %{sym_max}
-BuildRequires:  php-composer(symfony/dependency-injection) >= %{sym_min}
-BuildRequires:  php-composer(symfony/filesystem) <  %{sym_max}
-BuildRequires:  php-composer(symfony/filesystem) >= %{sym_min}
-BuildRequires:  php-composer(symfony/config) <  %{sym_max}
-BuildRequires:  php-composer(symfony/config) >= %{sym_min}
+BuildRequires:  %{sym_pref}-dependency-injection
+BuildRequires:  %{sym_pref}-filesystem
+BuildRequires:  %{sym_pref}-config
 BuildRequires:  php-bcmath
 BuildRequires:  php-date
 BuildRequires:  php-dom
@@ -73,16 +68,13 @@ BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 #        "php": ">=5.3.7"
-#        "symfony/dependency-injection": "^2.3.0|^3",
-#        "symfony/filesystem": "^2.3.0|^3",
-#        "symfony/config": "^2.3.0|^3"
+#        "symfony/dependency-injection": "^2.3.0|^3|^4",
+#        "symfony/filesystem": "^2.3.0|^3|^4",
+#        "symfony/config": "^2.3.0|^3|^4"
 Requires:       php(language) >= 5.3.7
-Requires:       php-composer(symfony/dependency-injection) >= %{sym_min}
-Requires:       php-composer(symfony/dependency-injection) <  %{sym_max}
-Requires:       php-composer(symfony/filesystem) >= %{sym_min}
-Requires:       php-composer(symfony/filesystem) <  %{sym_max}
-Requires:       php-composer(symfony/config) >= %{sym_min}
-Requires:       php-composer(symfony/config) <  %{sym_max}
+Requires:       %{sym_pref}-dependency-injection
+Requires:       %{sym_pref}-filesystem
+Requires:       %{sym_pref}-config
 # From phpcompatinfo report for version 2.3.0
 Requires:       php-bcmath
 Requires:       php-date
@@ -132,8 +124,8 @@ EOF
 
 find src/main/php -name \*php -exec sed -e 's:@package_version@:%{version}:' -i {} \;
 find src/test/php -name \*xml -exec sed -e 's:@package_version@:%{version}:' -i {} \;
-# https://github.com/pdepend/pdepend/issues/337
-sed -e '/project.version/s/2.5.0/%{version}/' -i build.properties
+# https://github.com/pdepend/pdepend/issues/357
+sed -e '/project.version/s/2.5.1/%{version}/' -i build.properties
 
 
 %build
@@ -184,13 +176,18 @@ fi
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
-%doc CHANGELOG
+%doc CHANGELOG.md
 %{php_home}
 %{_datadir}/%{name}
 %{_bindir}/pdepend
 
 
 %changelog
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 2.5.2-1
+- Update to 2.5.2
+- switch to symfony package names
+- open https://github.com/pdepend/pdepend/issues/357 missing changelog
+
 * Tue Nov 21 2017 Remi Collet <remi@remirepo.net> - 2.5.1-1
 - Update to 2.5.1
 - open https://github.com/pdepend/pdepend/issues/337 missing changelog