summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-16 15:25:51 +0100
committerRemi Collet <remi@remirepo.net>2021-03-16 15:25:51 +0100
commit5a5073b6d61b9c6271e7a9257c8366f443d3748d (patch)
tree54ea0b0ec340af9889e4230fd4865c931716e7ef
parenta01c14b63339c25ab84ba9556801968d9cf04420 (diff)
update to 4.0.0 dev
raise dependency on PHP 7.4
-rw-r--r--composer.json6
-rwxr-xr-xmakesrc.sh34
-rw-r--r--php-sebastian-version4.spec28
3 files changed, 40 insertions, 28 deletions
diff --git a/composer.json b/composer.json
index e76dbf4..88b1589 100644
--- a/composer.json
+++ b/composer.json
@@ -15,14 +15,14 @@
},
"config": {
"platform": {
- "php": "7.3.0"
+ "php": "7.4.0"
},
"optimize-autoloader": true,
"sort-packages": true
},
"prefer-stable": true,
"require": {
- "php": ">=7.3"
+ "php": ">=7.4"
},
"autoload": {
"classmap": [
@@ -31,7 +31,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
}
}
diff --git a/makesrc.sh b/makesrc.sh
index 4190c13..3580b58 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -3,26 +3,30 @@
NAME=$(basename $PWD)
OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
SHORT=${COMMIT:0:7}
-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+ echo "$NAME-$VERSION-$SHORT.tgz already there"
+else
+ echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
-echo "Cloning..."
-rm -rf $PROJECT-$COMMIT
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+ echo "Cloning..."
+ rm -rf $PROJECT-$COMMIT
+ git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer.json
-popd
+ echo "Getting commit..."
+ pushd $PROJECT-$COMMIT
+ git checkout $COMMIT || exit1
+ cp composer.json ../composer.json
+ popd
-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+ echo "Archiving..."
+ tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+ echo "Cleaning..."
+ rm -rf $PROJECT-$COMMIT
-echo "Done."
+ echo "Done."
+fi
diff --git a/php-sebastian-version4.spec b/php-sebastian-version4.spec
index 1f206b9..a1fcfa3 100644
--- a/php-sebastian-version4.spec
+++ b/php-sebastian-version4.spec
@@ -1,42 +1,46 @@
-# remirepo/fedora spec file for php-sebastian-version3
+# remirepo/fedora spec file for php-sebastian-version4
#
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit c6c1022351a901512170118436c764e473f6de8c
+%global gh_commit c4a4bb93c63e7449e849b1c80a7083fec21dbdc7
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project version
+%global gh_date 20210216
# Packagist
%global pk_vendor sebastian
%global pk_project %{gh_project}
# Namespace (fake ns_project as not PSR-4 compliant)
%global ns_vendor SebastianBergmann
%global ns_project Version
-%global ver_major 3
+%global ver_major 4
%global php_home %{_datadir}/php
+%global upstream_version 4.0.0
+%global upstream_prever dev
+
Name: php-%{pk_vendor}-%{pk_project}%{ver_major}
-Version: 3.0.2
-Release: 1%{?dist}
+Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release: 1%{?gh_date:.%{gh_date}.%{gh_short}}%{?dist}
Summary: Managing the version number of Git-hosted PHP projects, version %{ver_major}
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: %{name}-%{version}-%{gh_short}.tgz
+Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
Source1: makesrc.sh
BuildArch: noarch
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 7.4
BuildRequires: php-cli
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require": {
-# "php": ">=7.3"
-Requires: php(language) >= 7.3
+# "php": ">=7.4"
+Requires: php(language) >= 7.4
Requires: git
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -83,6 +87,10 @@ exit (class_exists("%{ns_vendor}\\%{ns_project}") ? 0 : 1);
%changelog
+* Tue Mar 16 2021 Remi Collet <remi@remirepo.net> - 4.0.0~dev-1.20210216.c4a4bb9
+- update to 4.0.0 dev
+- raise dependency on PHP 7.4
+
* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 3.0.2-1
- update to 3.0.2 (no change)