diff --git a/.gitignore b/.gitignore index 1b5fba3..5044512 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-jsstrip-1.0.1.zip +/php-jsstrip-1.0.1.tar.gz diff --git a/php-jsstrip-get-source.sh b/php-jsstrip-get-source.sh index 594b46e..a786a3c 100755 --- a/php-jsstrip-get-source.sh +++ b/php-jsstrip-get-source.sh @@ -20,12 +20,12 @@ if [[ -d "${repo_dir}" ]]; then echo "Error: the \"${repo_dir}\" directory already exists" >&2 exit 1 fi -if [[ -f "${repo_dir}.zip" ]]; then - echo "Error: the \"${repo_dir}.zip\" file already exists" >&2 +if [[ -f "${repo_dir}.tar.gz" ]]; then + echo "Error: the \"${repo_dir}.tar.gz\" file already exists" >&2 exit 1 fi git clone "${repo_url}" --branch "${version}" --depth 1 -- "${repo_dir}" -zip -9 "${repo_dir}.zip" -r "${repo_dir}" +tar --create --file "${repo_dir}.tar.gz" --gzip --exclude-vcs --verbose -- "${repo_dir}" rm -rf "${repo_dir}" diff --git a/php-splitbrain-php-jsstrip.spec b/php-splitbrain-php-jsstrip.spec index 6e811f2..fbf333b 100644 --- a/php-splitbrain-php-jsstrip.spec +++ b/php-splitbrain-php-jsstrip.spec @@ -3,9 +3,9 @@ Name: php-%{author}-%{project} Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} -Summary: PHP-based JavaScript compressor +Summary: PHP-based JavaScript compressor License: BSD-3-Clause URL: https://github.com/%{author}/%{project} @@ -17,7 +17,7 @@ URL: https://github.com/%{author}/%{project} # # The php-jsstrip-get-source.sh script is used to perform a git clone # of the reposistory (which does contain said files) and zip it up. -Source0: %{project}-%{version}.zip +Source0: %{project}-%{version}.tar.gz Source99: %{project}-get-source.sh BuildArch: noarch @@ -47,7 +47,7 @@ Provides: php-composer(%{author}/%{project}) = %{version} PHP JSStrip is PHP port of the original Python tool, jsstrip.py. It was originally ported to PHP in 2006 as part of the DokuWiki wiki engine. It has received several improvements over the years and is now available as a -standalone library. +standalone library. Quoting the original description: jsstrip is a open-source library to remove whitespace and comments from a JavaScript file. You might want to do this to @@ -96,5 +96,9 @@ phpunit8 --verbose --bootstrap %{buildroot}%{pkgdir}/autoload.php %changelog +* Sat Apr 15 2023 Artur Frenszek-Iwicki - 1.0.1-2 +- Compress source archive to .tar.gz instead of .zip +- Remove trailing whitespace in spec file + * Tue Apr 04 2023 Artur Frenszek-Iwicki - 1.0.1-1 - Initial packaging diff --git a/sources b/sources index ad61c04..33be342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-jsstrip-1.0.1.zip) = 6ec4c47be3e14803ea400f079285fead581dc7da030a934cc06f759652fca9c765d3724a9c86f9b6adb45e72ec148a717a42ecb9c4872a85939a5c8e915a58a4 +SHA512 (php-jsstrip-1.0.1.tar.gz) = 82c96d0f479c238beafa70258b5fe6ed2a99a2296172b0ebfd26bb6e391190f816ae3516742445b3bfb3efcd909613aee4b8b41423e57b2a06b4ebe5374b1dc1