summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json6
-rwxr-xr-xmakesrc.sh32
-rw-r--r--phpunit13.spec36
3 files changed, 31 insertions, 43 deletions
diff --git a/composer.json b/composer.json
index a1dad81..7de8b4f 100644
--- a/composer.json
+++ b/composer.json
@@ -44,9 +44,9 @@
"phpunit/php-text-template": "^6.0.0",
"phpunit/php-timer": "^9.0.0",
"sebastian/cli-parser": "^5.0.0",
- "sebastian/comparator": "^8.0.0",
- "sebastian/diff": "^8.0.0",
- "sebastian/environment": "^9.1.0",
+ "sebastian/comparator": "^8.1.0",
+ "sebastian/diff": "^8.1.0",
+ "sebastian/environment": "^9.2.0",
"sebastian/exporter": "^8.0.0",
"sebastian/git-state": "^1.0",
"sebastian/global-state": "^9.0.0",
diff --git a/makesrc.sh b/makesrc.sh
index 5e25d18..59cf430 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -1,39 +1,27 @@
#!/bin/bash
NAME=$(basename $PWD)
-DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec)
OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
-MAJOR=$(sed -n '/^%global ver_major/{s/.* //;p}' $NAME.spec)
-MINOR=$(sed -n '/^%global ver_minor/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
-SHORT=${COMMIT:0:7}
+VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-DATE=$(date -d "$DATE -1 week" +%Y-%m-%d)
-
-if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
- echo "$NAME-$VERSION-$SHORT.tgz already there"
+if [ -f $NAME-$VERSION.tgz ]; then
+ echo "$NAME-$VERSION.tgz already there"
else
- echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n"
+ echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION \n"
echo "Cloning..."
- rm -rf $PROJECT-$COMMIT
- git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || \
- git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || \
- exit 1
+ rm -rf $PROJECT-$VERSION
+ git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1
- echo "Getting commit..."
- pushd $PROJECT-$COMMIT
- git checkout $COMMIT || exit 1
- cp composer.json ../composer.json
- popd
+ echo "Getting composer..."
+ cp $PROJECT-$VERSION/composer.json composer.json
echo "Archiving..."
- tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+ tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION
echo "Cleaning..."
- rm -rf $PROJECT-$COMMIT
+ rm -rf $PROJECT-$VERSION
echo "Done."
fi
diff --git a/phpunit13.spec b/phpunit13.spec
index e2af900..bb096d0 100644
--- a/phpunit13.spec
+++ b/phpunit13.spec
@@ -19,9 +19,6 @@
%bcond_with defcmd
%endif
-%global gh_commit 97f27488f84718f8e7f9a2a31b5ca9f20698b06f
-%global gh_date 2026-04-03
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpunit
# Packagist
@@ -33,18 +30,15 @@
%global ver_major 13
%global ver_minor 1
-%global upstream_version 13.1.0
-#global upstream_prever dev
-
Name: %{pk_project}%{ver_major}
-Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Version: 13.1.1
Release: 1%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD-3-Clause
URL: https://github.com/%{gh_owner}/%{gh_project}
# run makesrc.sh to create a git snapshot with test suite
-Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
+Source0: %{name}-%{version}.tgz
Source1: makesrc.sh
# Fix command for autoload
@@ -61,9 +55,9 @@ BuildRequires: (php-composer(phpunit/php-invoker) >= 7.0.0 with php-c
BuildRequires: (php-composer(phpunit/php-text-template) >= 6.0.0 with php-composer(phpunit/php-text-template) < 7)
BuildRequires: (php-composer(phpunit/php-timer) >= 9.0.0 with php-composer(phpunit/php-timer) < 10)
BuildRequires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6)
-BuildRequires: (php-composer(sebastian/comparator) >= 8.0.0 with php-composer(sebastian/comparator) < 9)
-BuildRequires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9)
-BuildRequires: (php-composer(sebastian/environment) >= 9.1.0 with php-composer(sebastian/environment) < 10)
+BuildRequires: (php-composer(sebastian/comparator) >= 8.1.0 with php-composer(sebastian/comparator) < 9)
+BuildRequires: (php-composer(sebastian/diff) >= 8.1.0 with php-composer(sebastian/diff) < 9)
+BuildRequires: (php-composer(sebastian/environment) >= 9.2.0 with php-composer(sebastian/environment) < 10)
BuildRequires: (php-composer(sebastian/exporter) >= 8.0.0 with php-composer(sebastian/exporter) < 9)
BuildRequires: (php-composer(sebastian/git-state) >= 1.0.0 with php-composer(sebastian/git-state) < 2)
BuildRequires: (php-composer(sebastian/global-state) >= 9.0.0 with php-composer(sebastian/global-state) < 10)
@@ -98,9 +92,9 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "phpunit/php-text-template": "^6.0.0",
# "phpunit/php-timer": "^9.0.0",
# "sebastian/cli-parser": "^5.0.0",
-# "sebastian/comparator": "^8.0.0",
-# "sebastian/diff": "^8.0.0",
-# "sebastian/environment": "^9.1.0",
+# "sebastian/comparator": "^8.1.0",
+# "sebastian/diff": "^8.1.0",
+# "sebastian/environment": "^9.2.0",
# "sebastian/exporter": "^8.0.0",
# "sebastian/git-state": "^1.0",
# "sebastian/global-state": "^9.0.0",
@@ -126,9 +120,9 @@ Requires: (php-composer(phpunit/php-invoker) >= 7.0.0 with php-c
Requires: (php-composer(phpunit/php-text-template) >= 6.0.0 with php-composer(phpunit/php-text-template) < 7)
Requires: (php-composer(phpunit/php-timer) >= 9.0.0 with php-composer(phpunit/php-timer) < 10)
Requires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6)
-Requires: (php-composer(sebastian/comparator) >= 8.0.0 with php-composer(sebastian/comparator) < 9)
-Requires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9)
-Requires: (php-composer(sebastian/environment) >= 9.1.0 with php-composer(sebastian/environment) < 10)
+Requires: (php-composer(sebastian/comparator) >= 8.1.0 with php-composer(sebastian/comparator) < 9)
+Requires: (php-composer(sebastian/diff) >= 8.1.0 with php-composer(sebastian/diff) < 9)
+Requires: (php-composer(sebastian/environment) >= 9.2.0 with php-composer(sebastian/environment) < 10)
Requires: (php-composer(sebastian/exporter) >= 8.0.0 with php-composer(sebastian/exporter) < 9)
Requires: (php-composer(sebastian/git-state) >= 1.0.0 with php-composer(sebastian/git-state) < 2)
Requires: (php-composer(sebastian/global-state) >= 9.0.0 with php-composer(sebastian/global-state) < 10)
@@ -170,7 +164,7 @@ Documentation: https://phpunit.de/documentation.html
%prep
-%setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
%patch -P0 -p0 -b .rpm
find . -name \*.rpm -delete -print
@@ -302,6 +296,12 @@ exit $ret
%changelog
+* Wed Apr 8 2026 Remi Collet <remi@remirepo.net> - 13.1.1-1
+- update to 13.1.1
+- raise dependency on sebastian/comparator 8.1
+- raise dependency on sebastian/diff 8.1
+- raise dependency on sebastian/environment 9.2
+
* Fri Apr 3 2026 Remi Collet <remi@remirepo.net> - 13.1.0-1
- update to 13.1.0
- raise dependency on phpunit/php-code-coverage 14.0.0
generated by cgit (git 2.34.1) at 2026-04-25 11:09:38 +0000