diff --git a/.gitignore b/.gitignore index 339b9db..d61682b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1 @@ /php-gettext-gettext-3.5.9-8da2f945.tgz -/php-gettext-gettext-4.4.3.tar.gz -/Gettext-4.4.3.tar.gz -/Gettext-4.4.4.tar.gz -/tests-v4.4.4.tar.bz2 -/Gettext-4.5.0.tar.gz -/tests-v4.5.0.tar.bz2 -/Gettext-4.6.0.tar.gz -/tests-v4.6.0.tar.bz2 -/Gettext-4.6.3.tar.gz -/tests-v4.6.3.tar.bz2 -/tests-v4.7.0.tar.bz2 -/v4.7.0.tar.gz -/v5.5.1.tar.gz -/tests-v5.5.1.tar.bz2 -/v5.5.2.tar.gz -/v5.5.4.tar.gz -/v5.6.1.tar.gz -/v5.7.0.tar.gz diff --git a/dltests.sh b/dltests.sh deleted file mode 100755 index c29494e..0000000 --- a/dltests.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# This was borrowed from nodejs-grunt-contrib-concat - -tag=v5.7.0 - -set -e - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) - -pushd "$tmp" -git clone https://github.com/php-gettext/Gettext.git -ls -cd Gettext -git archive --prefix="tests/" --format=tar ${tag}:tests/ \ - | bzip2 > "$pwd"/tests-${tag}.tar.bz2 -popd diff --git a/php-gettext-gettext.spec b/php-gettext-gettext.spec index 90e684f..2ac282e 100644 --- a/php-gettext-gettext.spec +++ b/php-gettext-gettext.spec @@ -1,29 +1,25 @@ -%global gh_owner php-gettext +%global gh_commit 8da2f94538a2250275bb86b431c51e31e256e1e1 +%global gh_short %(c=%{gh_commit}; echo ${c:0:8}) +%global gh_owner oscarotero %global gh_project Gettext Name: php-gettext-gettext -Version: 5.7.0 -Release: 8%{?dist} +Version: 3.5.9 +Release: 5%{?dist} BuildArch: noarch License: MIT Summary: PHP gettext manager URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{url}/archive/v%{version}.tar.gz -# Upstream strips the tests from the tarball, so we have to generate it manually. -# dltests.sh is used to do this, and is included in this repository. -Source1: tests-v%{version}.tar.bz2 +Source0: %{name}-%{version}-%{gh_short}.tgz BuildRequires: dos2unix -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(gettext/languages) >= 2.3.0 with php-composer(gettext/languages) < 3) -%else -BuildRequires: php-gettext-languages >= 2.3.0 -%endif -BuildRequires: phpunit8 +BuildRequires: php-composer(gettext/languages) >= 2.0.0 +BuildRequires: php-composer(gettext/languages) < 3.0.0 +BuildRequires: phpunit -Requires: php(language) >= 5.4.0 +Requires: php(language) >= 5.3.0 Requires: php-date Requires: php-dom Requires: php-gettext @@ -33,11 +29,8 @@ Requires: php-simplexml Requires: php-spl Requires: php-tokenizer -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(gettext/languages) >= 2.3.0 with php-composer(gettext/languages) < 3) -%else -Requires: php-gettext-languages >= 2.3.0 -%endif +Requires: php-composer(gettext/languages) >= 2.0.0 +Requires: php-composer(gettext/languages) < 3.0.0 Provides: php-composer(gettext/gettext) = %{version} @@ -50,11 +43,13 @@ Autoloader: %{_datadir}/php/Gettext/autoload.php %prep -%setup -a1 -n Gettext-%{version} +%autosetup -n Gettext-%{gh_commit} # The documentation has the wrong newline codes dos2unix *.md +sed -i "s:include_once.*:\ninclude_once '%{buildroot}/%{_datadir}/php/Gettext/autoload.php';:" tests/bootstrap.php + %build : Create autoloader @@ -68,8 +63,6 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Gettext\\', __DIR__); -\Fedora\Autoloader\Autoload::addPsr4('Gettext\\Tests\\', 'tests'); - \Fedora\Autoloader\Dependencies::required(array( '%{_datadir}/php/Gettext/Languages/autoloader.php' )); @@ -85,26 +78,15 @@ cp -ar src/* %{buildroot}/%{_datadir}/php/Gettext/ %check -# Upstream no longer contains tests/bootstrap.php file -#sed -i "s:include_once.*:\ninclude_once '%{buildroot}/%{_datadir}/php/Gettext/autoload.php';:" tests/bootstrap.php - # gettext has some optional dependencies that we are not integrating with at this time (we can later # if desired). Thus, we need to skip the tests on these integration points since they will fail # without the dependencies. There is an upstream issue about compatibility issues with Twig: # https://github.com/oscarotero/Gettext/issues/137 +phpunit --bootstrap tests/bootstrap.php --filter ^\(\(?!\(testBlade\|testTwig\)\).\)*$ -: run upstream test suite with all installed PHP versions -ret=0 -for cmd in php php71 php72 php73 php74; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 --bootstrap %{buildroot}/%{_datadir}/php/Gettext/autoload.php tests --exclude-group default - fi -done -exit $ret %files %license LICENSE -%doc CHANGELOG.md %doc composer.json %doc CONTRIBUTING.md %doc README.md @@ -112,113 +94,22 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 5.7.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 5.7.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 5.7.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 5.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 5.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 5.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 12 2022 Sundeep Anand - 5.7.0-1 -- update to 5.7.0 (#2111800) - -* Fri Jul 22 2022 Fedora Release Engineering - 5.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 5.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Dec 7 2021 Sundeep Anand - 5.6.1-1 -- update to 5.6.1 (#2020848) - -* Fri Jul 23 2021 Fedora Release Engineering - 5.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed May 12 2021 Sundeep Anand - 5.5.4-1 -- update to 5.5.4 (#1903457) - -* Wed Jan 27 2021 Fedora Release Engineering - 5.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Nov 18 2020 Sundeep Anand - 5.5.2-1 -- update to 5.5.2 (#1898773) - -* Tue Jul 28 2020 Fedora Release Engineering - 5.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 24 2020 Sundeep Anand - 5.5.1-1 -- update to 5.5.1 (#1768669) - -* Thu Jan 30 2020 Fedora Release Engineering - 4.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 10 2019 Remi Collet - 4.7.0-2 -- update to 4.7.0 -- use range dependencies -- add patch for PHP 7.4 from -- https://github.com/oscarotero/Gettext/pull/230 - -* Thu Oct 10 2019 Sundeep Anand - 4.7.0-1 -- Update to 4.7.0 (#1759099). -- https://github.com/oscarotero/Gettext/blob/v4.7.0/CHANGELOG.md - -* Wed Sep 11 2019 Sundeep Anand - 4.6.3-2 -- Fix dependencies. - -* Tue Sep 10 2019 Sundeep Anand - 4.6.3-1 -- Update to 4.6.3 (#1742047). -- https://github.com/oscarotero/Gettext/blob/v4.6.3/CHANGELOG.md - -* Fri Jul 26 2019 Fedora Release Engineering - 4.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 4.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Jul 29 2018 Randy Barlow - 4.6.0-1 -- Update to 4.6.0 (#1595474). -- https://github.com/oscarotero/Gettext/blob/v4.6.0/CHANGELOG.md - -* Fri Jul 13 2018 Fedora Release Engineering - 4.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun May 20 2018 Randy Barlow - 4.5.0-1 -- Update to 4.5.0 (#1571010). -- https://github.com/oscarotero/Gettext/blob/v4.5.0/CHANGELOG.md - -* Sun Feb 25 2018 Randy Barlow - 4.4.4-1 -- Update to 4.4.4 (#1548216). -- https://github.com/oscarotero/Gettext/blob/v4.4.4/CHANGELOG.md - -* Fri Feb 09 2018 Fedora Release Engineering - 4.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 17 2017 Randy Barlow - 4.4.3-1 -- Update to 4.4.3 (#1450031). -- https://github.com/oscarotero/Gettext/blob/v4.4.3/CHANGELOG.md - -* Tue Oct 31 2017 Remi Collet - 3.5.9-7 -- fix FTBFS from Koschei -- add upstream patch for PHP 7.2 -- add patch for bigendian from https://github.com/oscarotero/Gettext/pull/159 - -* Thu Jul 27 2017 Fedora Release Engineering - 3.5.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Sun Apr 02 2017 Randy Barlow - 3.5.9-5 - Depend on php-dom and php-simplexml. - Don't provide /usr/share/php/Gettext. + +* Wed Feb 01 2017 Randy Barlow - 3.5.9-4 +- Remove dependency on twig/twig. + +* Wed Feb 01 2017 Randy Barlow - 3.5.9-3 +- Create a Fedora autoloader. +- Depend on twig/twig. +- Install to /usr/share/php/Gettext instead of the Gettext subdir of that path. + +* Sun Jan 22 2017 Randy Barlow - 3.5.9-2 +- Use a git snapshot instead of a GitHub URL so that we can run the + tests (except for two that need optional dependencies). +- require_once Gettext/Languages inside the autoloader. + +* Tue Jan 17 2017 Randy Barlow - 3.5.9-1 +- Initial release. diff --git a/sources b/sources index bd1afe1..2e3d46f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.0.tar.gz) = cfa8eae6751f604486c4aa4133c2d003c602ea9b8aa5de68c4ba594f91f12addf32306d0598a0fff1bf5b5707f4f96f73543868a569a757bb6b15113e3f51e9d +SHA512 (php-gettext-gettext-3.5.9-8da2f945.tgz) = b949a74bc5a39790a2621579469d81fb39d34c8c59616e68a38d256b7aef617f283b07c65080efd00cfdb0bd48bdfffcbc02659018e81e185edd444ff22c0d44 diff --git a/tests-v5.7.0.tar.bz2 b/tests-v5.7.0.tar.bz2 deleted file mode 100644 index a9b5b57..0000000 Binary files a/tests-v5.7.0.tar.bz2 and /dev/null differ