diff options
| author | Remi Collet <remi@remirepo.net> | 2026-07-07 11:26:10 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-07-07 11:26:10 +0200 |
| commit | 493388450fd85514c202252bc57bb6300730ac9c (patch) | |
| tree | 87f61dc1d7106816791a598d4ebdb2cdef829aa8 | |
| parent | fe5c664984e35b0fe0839cd6793a189986483dd9 (diff) | |
| -rwxr-xr-x | makesrc.sh | 23 | ||||
| -rw-r--r-- | php-sabre-dav4.spec | 13 |
2 files changed, 16 insertions, 20 deletions
@@ -4,29 +4,24 @@ 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} -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "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\n" + 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 + 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 $PROJECT-$COMMIT + tar czf $NAME-$VERSION.tgz --exclude-vcs $PROJECT-$VERSION echo "Cleaning..." - rm -rf $PROJECT-$COMMIT + rm -rf $PROJECT-$VERSION echo "Done." fi diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index c9e8d0a..596945a 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,8 +10,6 @@ %bcond_without tests # Github -%global gh_commit 074373bcd689a30bcf5aaa6bbb20a3395964ce7a -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav # Packagist @@ -24,14 +22,14 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.7.0 +Version: 4.7.1 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD # assets/openiconic is MIT License: BSD-3-Clause AND MIT -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}.tgz # git snapshot to retrieve tests Source1: makesrc.sh @@ -144,7 +142,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} mv lib/DAV/Browser/assets/openiconic/ICON-LICENSE . %patch -P0 -p1 -b .rpm @@ -195,7 +193,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84 php85 php86; do if which $cmdarg; then set $cmdarg for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do @@ -222,6 +220,9 @@ exit $ret %changelog +* Tue Jul 7 2026 Remi Collet <remi@remirepo.net> - 4.7.1-1 +- update to 4.7.1 + * Tue Oct 29 2024 Remi Collet <remi@remirepo.net> - 4.7.0-1 - update to 4.7.0 |