diff --git a/.gitignore b/.gitignore index b3181ea..0aaf08c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-sebastian-diff3-3.0.3-14f72dd.tar.gz /php-symfony-process-4.4.44.tar.gz /php-sebastian-diff3-3.0.4-6296a0c.tar.gz +/php-sebastian-diff3-3.0.6-98ff311.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..3d8028d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +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) +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" + +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 "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 16bcee6..af24786 100644 --- a/php-sebastian-diff3.spec +++ b/php-sebastian-diff3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-diff3 # -# Copyright (c) 2013-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 6296a0c086dd0117c1b78b059374d7fcbe7545ae +%global gh_commit 98ff311ca519c3aa73ccd3de053bdb377171d7b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -27,13 +27,14 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.4 -Release: 1%{?dist} +Version: 3.0.6 +Release: 4%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # php-symfony4 going to disapear, only used for tests %global symfony_version 4.4.44 Source2: https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz @@ -96,7 +97,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php80 php81 php82; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 --verbose || ret=1 @@ -117,8 +118,32 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 3.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 3.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Mar 5 2024 Remi Collet - 3.0.6-1 +- update to 3.0.6 +- sources from git snapshot + +* Thu Jan 25 2024 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 9 2023 Remi Collet - 3.0.4-1 - update to 3.0.4 + +* Fri Apr 21 2023 Remi Collet - 3.0.3-8 - use SPDX license ID - use bundled symfony/process for test diff --git a/sources b/sources index 5ea5891..0b19f48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (php-sebastian-diff3-3.0.4-6296a0c.tar.gz) = 487852d49ad55356edfc562ab0aec5d57ab143bde50897e2f23592f25d44330c45c353baf2cc111c1095f4165bcb3dcc437fc36e7a248d2ac849ca36714910ac +SHA512 (php-sebastian-diff3-3.0.6-98ff311.tgz) = bb5ab43ff80ac3b43bd1bb3bdab1977c74cf670ee3c5eca32b51b40bf519a1c4405467468ca58d73de681210693880e60d5e571333f975be8781536efbc24c29 SHA512 (php-symfony-process-4.4.44.tar.gz) = f50deca4d93f4252ecd32ff31b4c221ecab49172b369b37d862eca274aeb31fa4396b42224f84492e2cb82107acb8ffa90b39d006d5f9040d793fbe08486af46