v6.4.2

(cherry picked from commit ae4eb7b265)

.gitignore

@@ -45,3 +45,9 @@ clog
 /php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz
 /php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz
 /php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz
+/php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz
+/php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz
+/php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz
+/php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz
+/php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz
+/php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz

makesrc.sh

@@ -20,8 +20,11 @@ echo "Getting commit..."
 		composer install --no-interaction --no-progress --no-dev --optimize-autoloader
 		cp vendor/composer/installed.json ../
 
-        mkdir data
-		cp ${HOME}/.cache/bartlett/compatinfo-db.sqlite data
+		export DATABASE_URL=sqlite:///$PWD/data/compatinfo-db.sqlite
+		mkdir data
+		bin/phpcompatinfo db:create
+		bin/phpcompatinfo db:init
+		bin/phpcompatinfo diag
 	popd
 
 echo "Archiving..."

php-bartlett-PHP-CompatInfo.spec

@@ -11,13 +11,13 @@
 %undefine __brp_mangle_shebangs
 
 %{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-%global gh_commit    553a953cf4e823700aff8660a4cf6d354fc4aafd
+%global gh_commit    041352673a390b3e0822fc4b0e295ac6267dffbf
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151005
 %global gh_owner     llaville
 %global gh_project   php-compatinfo
 
-%global upstream_version  6.1.1
+%global upstream_version  6.4.2
 #global upstream_prever   RC1
 
 Name:           php-bartlett-PHP-CompatInfo
@@ -55,58 +55,62 @@ Requires:       php-spl
 Requires:       php-xmlreader
 
 # Bundled libraries
-Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.1
+# License BSD-3-Clause
+Provides: bundled(php-bartlett-php-compatinfo-db) = 4.3.0
+Provides: bundled(php-nikic-php-parser) = v4.15.1
+# License MIT
 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1
 Provides: bundled(php-brick-math) = 0.9.3
-Provides: bundled(php-composer-semver) = 3.2.7
-Provides: bundled(php-doctrine-annotations) = 1.13.2
-Provides: bundled(php-doctrine-cache) = 2.1.1
-Provides: bundled(php-doctrine-collections) = 1.6.8
-Provides: bundled(php-doctrine-common) = 3.2.1
-Provides: bundled(php-doctrine-dbal) = 3.3.0
-Provides: bundled(php-doctrine-deprecations) = v0.5.3
-Provides: bundled(php-doctrine-event-manager) = 1.1.1
-Provides: bundled(php-doctrine-inflector) = 2.0.4
-Provides: bundled(php-doctrine-instantiator) = 1.4.0
-Provides: bundled(php-doctrine-lexer) = 1.2.2
-Provides: bundled(php-doctrine-orm) = 2.11.0
-Provides: bundled(php-doctrine-persistence) = 2.3.0
-Provides: bundled(php-nikic-php-parser) = v4.13.2
+Provides: bundled(php-composer-semver) = 3.3.2
+Provides: bundled(php-doctrine-annotations) = 1.13.3
+Provides: bundled(php-doctrine-cache) = 2.2.0
+Provides: bundled(php-doctrine-collections) = 1.7.3
+Provides: bundled(php-doctrine-common) = 3.4.1
+Provides: bundled(php-doctrine-dbal) = 3.4.5
+Provides: bundled(php-doctrine-deprecations) = v1.0.0
+Provides: bundled(php-doctrine-event-manager) = 1.1.2
+Provides: bundled(php-doctrine-inflector) = 2.0.5
+Provides: bundled(php-doctrine-instantiator) = 1.4.1
+Provides: bundled(php-doctrine-lexer) = 1.2.3
+Provides: bundled(php-doctrine-orm) = 2.13.2
+Provides: bundled(php-doctrine-persistence) = 3.0.3
 Provides: bundled(php-psr-cache) = 1.0.1
 Provides: bundled(php-psr-container) = 1.1.2
 Provides: bundled(php-psr-event-dispatcher) = 1.0.0
 Provides: bundled(php-psr-log) = 1.1.4
 Provides: bundled(php-ramsey-collection) = 1.2.2
 Provides: bundled(php-ramsey-uuid) = 4.2.3
-Provides: bundled(php-symfony-amqp-messenger) = v5.4.0
-Provides: bundled(php-symfony-cache) = v5.4.2
-Provides: bundled(php-symfony-cache-contracts) = v2.5.0
-Provides: bundled(php-symfony-config) = v5.4.2
-Provides: bundled(php-symfony-console) = v5.4.2
-Provides: bundled(php-symfony-dependency-injection) = v5.4.2
-Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0
-Provides: bundled(php-symfony-doctrine-messenger) = v5.4.0
-Provides: bundled(php-symfony-event-dispatcher) = v5.4.0
-Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0
-Provides: bundled(php-symfony-filesystem) = v5.4.0
-Provides: bundled(php-symfony-finder) = v5.4.2
-Provides: bundled(php-symfony-messenger) = v5.4.2
-Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0
-Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0
-Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0
-Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0
-Provides: bundled(php-symfony-polyfill-php72) = v1.24.0
-Provides: bundled(php-symfony-polyfill-php73) = v1.24.0
-Provides: bundled(php-symfony-polyfill-php80) = v1.24.0
-Provides: bundled(php-symfony-polyfill-php81) = v1.24.0
-Provides: bundled(php-symfony-process) = v5.4.2
-Provides: bundled(php-symfony-redis-messenger) = v5.4.2
+Provides: bundled(php-symfony-amqp-messenger) = v5.4.11
+Provides: bundled(php-symfony-cache) = v5.4.11
+Provides: bundled(php-symfony-cache-contracts) = v2.5.2
+Provides: bundled(php-symfony-config) = v5.4.11
+Provides: bundled(php-symfony-console) = v5.4.12
+Provides: bundled(php-symfony-dependency-injection) = v5.4.11
+Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2
+Provides: bundled(php-symfony-doctrine-messenger) = v5.4.12
+Provides: bundled(php-symfony-event-dispatcher) = v5.4.9
+Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2
+Provides: bundled(php-symfony-filesystem) = v5.4.12
+Provides: bundled(php-symfony-finder) = v5.4.11
+Provides: bundled(php-symfony-http-client) = v5.4.12
+Provides: bundled(php-symfony-http-client-contracts) = v2.5.2
+Provides: bundled(php-symfony-messenger) = v5.4.11
+Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0
+Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
+Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0
+Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0
+Provides: bundled(php-symfony-polyfill-php72) = v1.26.0
+Provides: bundled(php-symfony-polyfill-php73) = v1.26.0
+Provides: bundled(php-symfony-polyfill-php80) = v1.26.0
+Provides: bundled(php-symfony-polyfill-php81) = v1.26.0
+Provides: bundled(php-symfony-process) = v5.4.11
+Provides: bundled(php-symfony-redis-messenger) = v5.4.6
 Provides: bundled(php-symfony-requirements-checker) = v2.0.1
-Provides: bundled(php-symfony-serializer) = v5.4.2
-Provides: bundled(php-symfony-service-contracts) = v2.5.0
-Provides: bundled(php-symfony-stopwatch) = v5.4.0
-Provides: bundled(php-symfony-string) = v5.4.2
-Provides: bundled(php-symfony-var-exporter) = v5.4.2
+Provides: bundled(php-symfony-serializer) = v5.4.12
+Provides: bundled(php-symfony-service-contracts) = v2.5.2
+Provides: bundled(php-symfony-stopwatch) = v5.4.5
+Provides: bundled(php-symfony-string) = v5.4.12
+Provides: bundled(php-symfony-var-exporter) = v5.4.10
 
 Provides: phpcompatinfo = %{version}
 Provides: php-composer(bartlett/php-compatinfo) = %{version}
@@ -123,6 +127,9 @@ show content of dictionary references.
 %setup -q -n %{gh_project}-%{gh_commit}
 %patch0 -p1 -b .rpm
 
+# https://github.com/llaville/php-compatinfo-db/issues/112
+sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php
+
 : Gather all license files and cleanup tests
 mv vendor/composer/LICENSE composer_LICENSE
 for vendor in $(ls vendor)
@@ -143,14 +150,17 @@ php -r '
         echo "cant decode json file\n";
 		exit(3);
 	}
-	$lic = [];
+	$res = [];
     foreach($pkgs["packages"] as $pkg) {
-        printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
-        $lic = array_merge($lic, $pkg["license"]);
+		$lic = implode(" and ", $pkg["license"]);
+		if (!isset($res[$lic])) $res[$lic] = [];
+		$res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
 	}
-	sort($lic);
-	printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));'
-
+	foreach($res as $lic => $lib) {
+		sort($lib);
+		printf("# License %s\n%s\n", $lic, implode("\n", $lib));
+	}
+'
 
 %build
 # Nothing
@@ -186,6 +196,37 @@ install -D -p -m 755 %{SOURCE1}          %{buildroot}%{_datadir}/%{name}/fedora-
 
 
 %changelog
+* Tue Sep 27 2022 Remi Collet <remi@remirepo.net> - 6.4.2-1
+- update to 6.4.2
+
+* Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 6.4.1-2
+- update bundled bartlett/php-compatinfo-db to 4.2.0
+
+* Thu Apr  7 2022 Remi Collet <remi@remirepo.net> - 6.4.1-1
+- update to 6.4.1
+
+* Wed Apr  6 2022 Remi Collet <remi@remirepo.net> - 6.4.0-1
+- update to 6.4.0
+- update bundled bartlett/php-compatinfo-db to 4.2.0
+
+* Mon Mar  7 2022 Remi Collet <remi@remirepo.net> - 6.3.0-1
+- update to 6.3.0
+- update bundled bartlett/php-compatinfo-db to 4.1.0
+
+* Mon Feb  7 2022 Remi Collet <remi@remirepo.net> - 6.2.0-1
+- update to 6.2.0
+- update bundled bartlett/php-compatinfo-db to 4.0.0
+
+* Fri Jan 28 2022 Remi Collet <remi@remirepo.net> - 6.1.2-1
+- update to 6.1.2
+
+* Thu Jan 27 2022 Remi Collet <remi@remirepo.net> - 6.1.1-5
+- update bundled bartlett/php-compatinfo-db 3.18.0
+- use better process to create the database, as discussed on
+  https://github.com/llaville/php-compatinfo-db/issues/113
+- silent touch on read only database, reported as
+  https://github.com/llaville/php-compatinfo-db/issues/112
+
 * Tue Jan 18 2022 Remi Collet <remi@remirepo.net> - 6.1.1-1
 - update to 6.1.1
 - update bundled bartlett/php-compatinfo-db 3.17.1

sources

@@ -1 +1 @@
-SHA512 (php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz) = aea64d7008e75e586d0f2c19310fc24b44a4fe20101efe08834205ef891278d162fada342b4119f5d89d51de135b6c9473514c4171e5a0754a0d99e2d15f7e02
+SHA512 (php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz) = 411f65565bf02a6d298095265bb776b435e97058ec28fabaab9ee77a1cb82d2f64a7b55b668fa24c254bf168e6e34fd4260a35b2682fe6e9cdf0c623a699b72e