From 9613397f4abeb19fde5bc79b561ac8606ce0029f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:53:36 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index b7b8488..f5cf49f 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -86,6 +86,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.4.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.4.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8913a6a5a658e01a7a7e4605d8bda1ec427cf620 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:11:56 +0000 Subject: [PATCH 02/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index f5cf49f..42a10aa 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -86,6 +86,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.4.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.4.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f0fffb66c41dd96dfb9519b471d2ee87a554670c Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 6 May 2020 01:33:04 +0200 Subject: [PATCH 03/15] Update source and target for JDK 11 --- yuicompressor-java-version.patch | 14 ++++++++++++++ yuicompressor.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 yuicompressor-java-version.patch diff --git a/yuicompressor-java-version.patch b/yuicompressor-java-version.patch new file mode 100644 index 0000000..b6a2e20 --- /dev/null +++ b/yuicompressor-java-version.patch @@ -0,0 +1,14 @@ +diff -ur yuicompressor-2.4.8.orig/build.xml yuicompressor-2.4.8/build.xml +--- yuicompressor-2.4.8.orig/build.xml 2020-05-06 00:06:12.442911120 +0200 ++++ yuicompressor-2.4.8/build.xml 2020-05-06 00:11:53.587321510 +0200 +@@ -33,8 +33,8 @@ + deprecation="off" + debug="on" + includeantruntime="false" +- target="1.5" +- source="1.5"> ++ target="1.6" ++ source="1.6"> + + + diff --git a/yuicompressor.spec b/yuicompressor.spec index 42a10aa..7a41301 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -33,6 +33,8 @@ Patch0: %{name}-rhino.patch Patch1: %{name}-remove-jars.patch # Fix test script - only test yuicompressor, not rhino Patch2: %{name}-tests.patch +# Update source and target for JDK 11 +Patch3: %{name}-java-version.patch BuildArch: noarch BuildRequires: ant @@ -60,6 +62,7 @@ extension (js or css). %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Remove prebuilt jars rm -rf lib/* ln -s $(build-classpath jargs) lib @@ -86,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Tue May 05 2020 Mattias Ellert - 2.4.8-8 +- Update source and target for JDK 11 + * Fri Jan 31 2020 Fedora Release Engineering - 2.4.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cee3c0d0a6f5b31658bd16781e9a071cc43f8c25 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 09:14:00 +0200 Subject: [PATCH 04/15] Rebuilt for JDK-11 --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 7a41301..0753520 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Sat Jul 11 2020 Jiri Vanek - 2.4.8-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue May 05 2020 Mattias Ellert - 2.4.8-8 - Update source and target for JDK 11 From 577c0ca20a40e6ac02a6c28c97bc484388917edb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:17:39 +0000 Subject: [PATCH 05/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 0753520..5c53892 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.4.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 2.4.8-9 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 66a2a15ca44bd54edec614e2e8c85c7ec97101b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:36:39 +0000 Subject: [PATCH 06/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 5c53892..e79ba1f 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2.4.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.4.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c99dc13661968227040cf1606a4bb15f8d0db330 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:12:05 +0000 Subject: [PATCH 07/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index e79ba1f..93eb84d 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.4.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2.4.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7946102859056e1bd04bd0d10aefe28c726e05dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:45:50 +0000 Subject: [PATCH 08/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 93eb84d..c1e4247 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.4.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.4.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dc7f9ca4b72d30cf57a413173724f68592db07d0 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:52:11 +0100 Subject: [PATCH 09/15] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index c1e4247..45bfc27 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 13%{?dist} +Release: 14%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -89,6 +89,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 2.4.8-14 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 2.4.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9df1f50b5859b6b97ff8df1578be6b72b48b313a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 6 Feb 2022 18:57:54 +0100 Subject: [PATCH 10/15] Update source and target for JDK 17 --- yuicompressor-java-version.patch | 4 ++-- yuicompressor.spec | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/yuicompressor-java-version.patch b/yuicompressor-java-version.patch index b6a2e20..fe95c30 100644 --- a/yuicompressor-java-version.patch +++ b/yuicompressor-java-version.patch @@ -7,8 +7,8 @@ diff -ur yuicompressor-2.4.8.orig/build.xml yuicompressor-2.4.8/build.xml includeantruntime="false" - target="1.5" - source="1.5"> -+ target="1.6" -+ source="1.6"> ++ target="1.7" ++ source="1.7"> diff --git a/yuicompressor.spec b/yuicompressor.spec index 45bfc27..2ac99d9 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -33,7 +33,7 @@ Patch0: %{name}-rhino.patch Patch1: %{name}-remove-jars.patch # Fix test script - only test yuicompressor, not rhino Patch2: %{name}-tests.patch -# Update source and target for JDK 11 +# Update source and target for JDK 17 Patch3: %{name}-java-version.patch BuildArch: noarch @@ -91,6 +91,7 @@ tests/suite.sh %changelog * Sat Feb 05 2022 Jiri Vanek - 2.4.8-14 - Rebuilt for java-17-openjdk as system jdk +- Update source and target for JDK 17 * Sat Jan 22 2022 Fedora Release Engineering - 2.4.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c24b9b30e5ff5beb422db4f20ace12bf7f89969c Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 17:05:17 +0200 Subject: [PATCH 11/15] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- yuicompressor.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 2ac99d9..4afd57a 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 14%{?dist} +Release: 15%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -37,6 +37,7 @@ Patch2: %{name}-tests.patch Patch3: %{name}-java-version.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: mvn(net.sf:jargs) @@ -89,6 +90,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Fri Jul 08 2022 Jiri Vanek - 2.4.8-15 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 2.4.8-14 - Rebuilt for java-17-openjdk as system jdk - Update source and target for JDK 17 From 4c455d0047fdb7d70da1e54df9b982002e67244f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 18 Jul 2022 23:54:55 +0200 Subject: [PATCH 12/15] mixed-use-of-spaces-and-tabs --- yuicompressor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 4afd57a..81f32fc 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -37,7 +37,7 @@ Patch2: %{name}-tests.patch Patch3: %{name}-java-version.patch BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: mvn(net.sf:jargs) From e1aedcccae3f1a5714e6ff79c6495e834595d112 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:49:03 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yuicompressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuicompressor.spec b/yuicompressor.spec index 81f32fc..85952b5 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 15%{?dist} +Release: 16%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -90,6 +90,9 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.4.8-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 2.4.8-15 - Rebuilt for Drop i686 JDKs From bd55379bb7838c2c44c6e2bdd00b948d8086e753 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 21 Sep 2022 11:11:13 +0200 Subject: [PATCH 14/15] Fix test script Don't use /dev/stderr (permission denied) Replace egrep with grep -E --- yuicompressor-tests.patch | 40 ++++++++++++++++++++++++++++++--------- yuicompressor.spec | 7 ++++++- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/yuicompressor-tests.patch b/yuicompressor-tests.patch index 3a2b94f..70c9599 100644 --- a/yuicompressor-tests.patch +++ b/yuicompressor-tests.patch @@ -1,6 +1,6 @@ diff -ur yuicompressor-2.4.8.orig/tests/suite.sh yuicompressor-2.4.8/tests/suite.sh --- yuicompressor-2.4.8.orig/tests/suite.sh 2013-05-15 09:23:58.000000000 +0200 -+++ yuicompressor-2.4.8/tests/suite.sh 2017-12-07 03:45:47.374338608 +0100 ++++ yuicompressor-2.4.8/tests/suite.sh 2022-09-21 10:18:43.502934886 +0200 @@ -1,7 +1,7 @@ -#!/usr/bin/env bash +#!/bin/sh @@ -11,9 +11,16 @@ diff -ur yuicompressor-2.4.8.orig/tests/suite.sh yuicompressor-2.4.8/tests/suite # Get the jar to use. jar="$(ls ../build/*.jar | sort | tail -n1)" echo "jar: $jar" -@@ -15,18 +15,11 @@ +@@ -13,22 +13,15 @@ + cat $expected + )" filetype="$( - echo $testfile | egrep -o '(cs|j)s' +- echo $testfile | egrep -o '(cs|j)s' ++ echo $testfile | grep -E -o '(cs|j)s' ++ )" ++ ++ actual="$( ++ java -cp $(build-classpath jargs):$jar com.yahoo.platform.yui.compressor.Bootstrap --type $filetype $testfile )" - - if [ "$2" == "cssminjs" ]; then @@ -27,15 +34,30 @@ diff -ur yuicompressor-2.4.8.orig/tests/suite.sh yuicompressor-2.4.8/tests/suite - )" - fi - -+ -+ actual="$( -+ java -cp $(build-classpath jargs):$jar com.yahoo.platform.yui.compressor.Bootstrap --type $filetype $testfile -+ )" + if [ "$expected" == "$actual" ]; then - echo "Passed: $testfile" > /dev/stderr +- echo "Passed: $testfile" > /dev/stderr ++ echo "Passed: $testfile" 1>&2 else -@@ -52,11 +45,3 @@ + ( + echo "Test failed: $testfile" +@@ -38,25 +31,17 @@ + echo "" + echo "Actual:" + echo "$actual" +- ) > /dev/stderr ++ ) 1>&2 + return 1 + fi + } + + + ls *.FAIL 2>/dev/null | while read failtest; do +- echo "Failing test: " $failtest > /dev/stderr ++ echo "Failing test: " $failtest 1>&2 + runtest $failtest && echo "Test passed, please remove the '.FAIL' from the filename" + done + ls *.{css,js} | while read testfile; do runtest $testfile || exit 1 done diff --git a/yuicompressor.spec b/yuicompressor.spec index 85952b5..abc56c1 100644 --- a/yuicompressor.spec +++ b/yuicompressor.spec @@ -1,6 +1,6 @@ Name: yuicompressor Version: 2.4.8 -Release: 16%{?dist} +Release: 17%{?dist} Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor # Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ @@ -90,6 +90,11 @@ tests/suite.sh %license LICENSE.TXT LICENSE.txt %changelog +* Wed Sep 21 2022 Mattias Ellert - 2.4.8-17 +- Fix test script + - Don't use /dev/stderr (permission denied) + - Replace egrep with grep -E + * Sat Jul 23 2022 Fedora Release Engineering - 2.4.8-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 875f2b83494dabfe34af5dd11e48b9993bc444d8 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 18 Jan 2023 10:59:33 +0100 Subject: [PATCH 15/15] Retired due to missing dependency jargs For minifying javascript use uglify-js instead For minifying css use python3-rcssmin instead --- .gitignore | 1 - README.md | 3 - dead.package | 3 + sources | 2 - yuicompressor-java-version.patch | 14 -- yuicompressor-remove-jars.patch | 26 ---- yuicompressor-rhino.patch | 255 ------------------------------- yuicompressor-rhino.sh | 9 -- yuicompressor-tests.patch | 71 --------- yuicompressor.1 | 51 ------- yuicompressor.pom | 63 -------- yuicompressor.spec | 146 ------------------ 12 files changed, 3 insertions(+), 641 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 sources delete mode 100644 yuicompressor-java-version.patch delete mode 100644 yuicompressor-remove-jars.patch delete mode 100644 yuicompressor-rhino.patch delete mode 100755 yuicompressor-rhino.sh delete mode 100644 yuicompressor-tests.patch delete mode 100644 yuicompressor.1 delete mode 100644 yuicompressor.pom delete mode 100644 yuicompressor.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f6a3a77..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 1cb985d..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# yuicompressor - -The yuicompressor package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0a0853d --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +Retired due to missing dependency jargs +For minifying javascript use uglify-js instead +For minifying css use python3-rcssmin instead diff --git a/sources b/sources deleted file mode 100644 index d8dbdab..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (yuicompressor-2.4.8.tar.gz) = cb955fc3677f930403f4f97aaad5d6ca5ec6ee834f464005ddfd8d83c4a532180859b72d55a4025b13f05a6a0146a1391d93668452e57035d4fc4f4d7f20d00b -SHA512 (yuicompressor-rhino1_7R2.tar.gz) = 9613b61a435fb12906b1317b7c244346cbc59991cf7d775e726accd68b83c172dee71175e55cf85e48c07585a2c25f0b6e423fc6cd20961b465060f6bf7fae29 diff --git a/yuicompressor-java-version.patch b/yuicompressor-java-version.patch deleted file mode 100644 index fe95c30..0000000 --- a/yuicompressor-java-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur yuicompressor-2.4.8.orig/build.xml yuicompressor-2.4.8/build.xml ---- yuicompressor-2.4.8.orig/build.xml 2020-05-06 00:06:12.442911120 +0200 -+++ yuicompressor-2.4.8/build.xml 2020-05-06 00:11:53.587321510 +0200 -@@ -33,8 +33,8 @@ - deprecation="off" - debug="on" - includeantruntime="false" -- target="1.5" -- source="1.5"> -+ target="1.7" -+ source="1.7"> - - - diff --git a/yuicompressor-remove-jars.patch b/yuicompressor-remove-jars.patch deleted file mode 100644 index c0fbfd1..0000000 --- a/yuicompressor-remove-jars.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur yuicompressor-2.4.8.orig/build.xml yuicompressor-2.4.8/build.xml ---- yuicompressor-2.4.8.orig/build.xml 2013-05-15 09:23:58.000000000 +0200 -+++ yuicompressor-2.4.8/build.xml 2017-12-20 11:55:21.853626638 +0100 -@@ -36,20 +36,16 @@ - target="1.5" - source="1.5"> - -- -- -+ - - - - - - -- -- -- - - -+ - - - diff --git a/yuicompressor-rhino.patch b/yuicompressor-rhino.patch deleted file mode 100644 index c5776d9..0000000 --- a/yuicompressor-rhino.patch +++ /dev/null @@ -1,255 +0,0 @@ -diff -ur yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Decompiler.java yuicompressor-2.4.8/src/org/mozilla/javascript/Decompiler.java ---- yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Decompiler.java 2009-03-22 14:32:26.000000000 +0100 -+++ yuicompressor-2.4.8/src/org/mozilla/javascript/Decompiler.java 2017-12-05 17:33:46.070639980 +0100 -@@ -166,6 +166,18 @@ - appendString('/' + regexp + '/' + flags); - } - -+ void addJScriptConditionalComment(String str) -+ { -+ addToken(Token.CONDCOMMENT); -+ appendString(str); -+ } -+ -+ void addPreservedComment(String str) -+ { -+ addToken(Token.KEEPCOMMENT); -+ appendString(str); -+ } -+ - void addNumber(double n) - { - addToken(Token.NUMBER); -diff -ur yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Parser.java yuicompressor-2.4.8/src/org/mozilla/javascript/Parser.java ---- yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Parser.java 2009-03-22 14:32:24.000000000 +0100 -+++ yuicompressor-2.4.8/src/org/mozilla/javascript/Parser.java 2017-12-05 17:33:46.071639969 +0100 -@@ -2465,6 +2465,16 @@ - reportError("msg.unexpected.eof"); - break; - -+ case Token.CONDCOMMENT: -+ String condComment = ts.getString(); -+ decompiler.addJScriptConditionalComment(condComment); -+ return nf.createString(condComment); -+ -+ case Token.KEEPCOMMENT: -+ String keepComment = ts.getString(); -+ decompiler.addPreservedComment(keepComment); -+ return nf.createString(keepComment); -+ - default: - reportError("msg.syntax"); - break; -diff -ur yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Token.java yuicompressor-2.4.8/src/org/mozilla/javascript/Token.java ---- yuicompressor-2.4.8.orig/src/org/mozilla/javascript/Token.java 2009-03-22 14:32:26.000000000 +0100 -+++ yuicompressor-2.4.8/src/org/mozilla/javascript/Token.java 2017-12-05 17:33:46.072639958 +0100 -@@ -258,7 +258,11 @@ - LETEXPR = 157, - WITHEXPR = 158, - DEBUGGER = 159, -- LAST_TOKEN = 159; -+ -+ CONDCOMMENT = 160, // JScript conditional comment -+ KEEPCOMMENT = 161, // /*! ... */ comment -+ -+ LAST_TOKEN = 161; - - public static String name(int token) - { -diff -ur yuicompressor-2.4.8.orig/src/org/mozilla/javascript/TokenStream.java yuicompressor-2.4.8/src/org/mozilla/javascript/TokenStream.java ---- yuicompressor-2.4.8.orig/src/org/mozilla/javascript/TokenStream.java 2009-03-22 14:32:26.000000000 +0100 -+++ yuicompressor-2.4.8/src/org/mozilla/javascript/TokenStream.java 2017-12-05 17:33:46.072639958 +0100 -@@ -526,7 +526,7 @@ - stringBufferTop = 0; - - c = getChar(); -- strLoop: while (c != quoteChar) { -+ while (c != quoteChar) { - if (c == '\n' || c == EOF_CHAR) { - ungetChar(c); - parser.addError("msg.unterminated.string.lit"); -@@ -535,89 +535,47 @@ - - if (c == '\\') { - // We've hit an escaped character -- int escapeVal; - - c = getChar(); -+ - switch (c) { -- case 'b': c = '\b'; break; -- case 'f': c = '\f'; break; -- case 'n': c = '\n'; break; -- case 'r': c = '\r'; break; -- case 't': c = '\t'; break; -- -- // \v a late addition to the ECMA spec, -- // it is not in Java, so use 0xb -- case 'v': c = 0xb; break; -- -- case 'u': -- // Get 4 hex digits; if the u escape is not -- // followed by 4 hex digits, use 'u' + the -- // literal character sequence that follows. -- int escapeStart = stringBufferTop; -- addToString('u'); -- escapeVal = 0; -- for (int i = 0; i != 4; ++i) { -- c = getChar(); -- escapeVal = Kit.xDigitToInt(c, escapeVal); -- if (escapeVal < 0) { -- continue strLoop; -- } -+ -+ case '\\': // backslash -+ case 'b': // backspace -+ case 'f': // form feed -+ case 'n': // line feed -+ case 'r': // carriage return -+ case 't': // horizontal tab -+ case 'v': // vertical tab -+ case 'd': // octal sequence -+ case 'u': // unicode sequence -+ case 'x': // hexadecimal sequence -+ // Only keep the '\' character for those -+ // characters that need to be escaped... -+ // Don't escape quoting characters... -+ addToString('\\'); - addToString(c); -- } -- // prepare for replace of stored 'u' sequence -- // by escape value -- stringBufferTop = escapeStart; -- c = escapeVal; -- break; -- case 'x': -- // Get 2 hex digits, defaulting to 'x'+literal -- // sequence, as above. -- c = getChar(); -- escapeVal = Kit.xDigitToInt(c, 0); -- if (escapeVal < 0) { -- addToString('x'); -- continue strLoop; -- } else { -- int c1 = c; -- c = getChar(); -- escapeVal = Kit.xDigitToInt(c, escapeVal); -- if (escapeVal < 0) { -- addToString('x'); -- addToString(c1); -- continue strLoop; -- } else { -- // got 2 hex digits -- c = escapeVal; -- } -- } -- break; -+ break; - -- case '\n': -- // Remove line terminator after escape to follow -- // SpiderMonkey and C/C++ -- c = getChar(); -- continue strLoop; -- -- default: -- if ('0' <= c && c < '8') { -- int val = c - '0'; -- c = getChar(); -- if ('0' <= c && c < '8') { -- val = 8 * val + c - '0'; -- c = getChar(); -- if ('0' <= c && c < '8' && val <= 037) { -- // c is 3rd char of octal sequence only -- // if the resulting val <= 0377 -- val = 8 * val + c - '0'; -- c = getChar(); -- } -+ case '\n': -+ // Remove line terminator after escape -+ break; -+ -+ default: -+ if (isDigit(c)) { -+ // Octal representation of a character. -+ // Preserve the escaping (see Y! bug #1637286) -+ addToString('\\'); - } -- ungetChar(c); -- c = val; -- } -+ addToString(c); -+ break; - } -+ -+ } else { -+ -+ addToString(c); - } -- addToString(c); -+ - c = getChar(); - } - -@@ -760,16 +718,35 @@ - } - if (matchChar('*')) { - boolean lookForSlash = false; -+ StringBuffer sb = new StringBuffer(); - for (;;) { - c = getChar(); - if (c == EOF_CHAR) { - parser.addError("msg.unterminated.comment"); - return Token.ERROR; -- } else if (c == '*') { -+ } -+ sb.append((char) c); -+ if (c == '*') { - lookForSlash = true; - } else if (c == '/') { - if (lookForSlash) { -- continue retry; -+ sb.delete(sb.length()-2, sb.length()); -+ String s1 = sb.toString(); -+ String s2 = s1.trim(); -+ if (s1.startsWith("!")) { -+ // Remove the leading '!' -+ this.string = s1.substring(1); -+ return Token.KEEPCOMMENT; -+ } else if (s2.startsWith("@cc_on") || -+ s2.startsWith("@if") || -+ s2.startsWith("@elif") || -+ s2.startsWith("@else") || -+ s2.startsWith("@end")) { -+ this.string = s1; -+ return Token.CONDCOMMENT; -+ } else { -+ continue retry; -+ } - } - } else { - lookForSlash = false; -@@ -876,9 +853,9 @@ - if (startToken != Token.DIV) Kit.codeBug(); - } - -- boolean inCharSet = false; // true if inside a '['..']' pair - int c; -- while ((c = getChar()) != '/' || inCharSet) { -+ boolean inClass = false; -+ while ((c = getChar()) != '/' || inClass) { - if (c == '\n' || c == EOF_CHAR) { - ungetChar(c); - throw parser.reportError("msg.unterminated.re.lit"); -@@ -887,9 +864,9 @@ - addToString(c); - c = getChar(); - } else if (c == '[') { -- inCharSet = true; -+ inClass = true; - } else if (c == ']') { -- inCharSet = false; -+ inClass = false; - } - addToString(c); - } diff --git a/yuicompressor-rhino.sh b/yuicompressor-rhino.sh deleted file mode 100755 index 3e09318..0000000 --- a/yuicompressor-rhino.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -rhino=rhino1_7R2 - -wget -N http://ftp.mozilla.org/pub/mozilla.org/js/${rhino}.zip -rm -rf ${rhino} -unzip ${rhino}.zip ${rhino}/src/org/mozilla/* ${rhino}/LICENSE.txt -( cd ${rhino} ; tar -z -c --group root --owner root -f ../yuicompressor-${rhino}.tar.gz src LICENSE.txt ) -rm ${rhino}.zip diff --git a/yuicompressor-tests.patch b/yuicompressor-tests.patch deleted file mode 100644 index 70c9599..0000000 --- a/yuicompressor-tests.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -ur yuicompressor-2.4.8.orig/tests/suite.sh yuicompressor-2.4.8/tests/suite.sh ---- yuicompressor-2.4.8.orig/tests/suite.sh 2013-05-15 09:23:58.000000000 +0200 -+++ yuicompressor-2.4.8/tests/suite.sh 2022-09-21 10:18:43.502934886 +0200 -@@ -1,7 +1,7 @@ --#!/usr/bin/env bash -+#!/bin/sh - - cd $(dirname $0) -- -+ - # Get the jar to use. - jar="$(ls ../build/*.jar | sort | tail -n1)" - echo "jar: $jar" -@@ -13,22 +13,15 @@ - cat $expected - )" - filetype="$( -- echo $testfile | egrep -o '(cs|j)s' -+ echo $testfile | grep -E -o '(cs|j)s' -+ )" -+ -+ actual="$( -+ java -cp $(build-classpath jargs):$jar com.yahoo.platform.yui.compressor.Bootstrap --type $filetype $testfile - )" -- -- if [ "$2" == "cssminjs" ]; then -- actual="$( -- java -jar ../lib/rhino-1.7R2.jar suite.rhino $testfile -- )" -- -- else -- actual="$( -- java -jar $jar --type $filetype $testfile -- )" -- fi -- -+ - if [ "$expected" == "$actual" ]; then -- echo "Passed: $testfile" > /dev/stderr -+ echo "Passed: $testfile" 1>&2 - else - ( - echo "Test failed: $testfile" -@@ -38,25 +31,17 @@ - echo "" - echo "Actual:" - echo "$actual" -- ) > /dev/stderr -+ ) 1>&2 - return 1 - fi - } - - - ls *.FAIL 2>/dev/null | while read failtest; do -- echo "Failing test: " $failtest > /dev/stderr -+ echo "Failing test: " $failtest 1>&2 - runtest $failtest && echo "Test passed, please remove the '.FAIL' from the filename" - done - - ls *.{css,js} | while read testfile; do - runtest $testfile || exit 1 - done -- --echo --echo "now testing the JS port of CSSMIN..." --ls *.css | while read testfile; do -- runtest $testfile "cssminjs" || exit 1 --done -- --exit 0 diff --git a/yuicompressor.1 b/yuicompressor.1 deleted file mode 100644 index 6bded98..0000000 --- a/yuicompressor.1 +++ /dev/null @@ -1,51 +0,0 @@ -.TH YUI-COMPRESSOR "1" "January 2010" "yui-compressor " "User Commands" -.SH NAME -yuicompressor \- JavaScript/CSS minifier -.SH SYNOPSIS -.B yuicompressor -\fR[\fIoptions\fR] [\fIinput file\fR] -.SH DESCRIPTION -Global Options -.TP -\fB\-h\fR, \fB\-\-help\fR -Displays this information -.TP -\fB\-\-type\fR -Specifies the type of the input file -.TP -\fB\-\-charset\fR -Read the input file using -.TP -\fB\-\-line\-break\fR -Insert a line break after the specified column number -.TP -\fB\-v\fR, \fB\-\-verbose\fR -Display informational messages and warnings -.TP -\fB\-o\fR -Place the output into . Defaults to stdout. -.PP -JavaScript Options -.TP -\fB\-\-nomunge\fR -Minify only, do not obfuscate -.TP -\fB\-\-preserve\-semi\fR -Preserve all semicolons -.TP -\fB\-\-disable\-optimizations\fR -Disable all micro optimizations -.PP -If no input file is specified, it defaults to stdin. In this case, the 'type' -option is required. Otherwise, the 'type' option is required only if the input -file extension is neither 'js' nor 'css'. -.SH EXAMPLES -The following example demonstrates how to use yuicompressor -.TP -.B yuicompressor -o compressed.js original.js -.SH SEE ALSO -.BR /usr/share/doc/yuicompressor/README.md -.SH AUTHOR -This manual page was written by Damien Raude-Morvan -and Michael Gilbert , -for the Debian GNU/Linux system (but may be used by others). diff --git a/yuicompressor.pom b/yuicompressor.pom deleted file mode 100644 index 2838b0b..0000000 --- a/yuicompressor.pom +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4.0.0 - com.yahoo.platform.yui - yuicompressor - 2.4.8 - jar - - yui compressor - http://developer.yahoo.com/yui/compressor/ - - - The YUI Compressor is a JavaScript compressor which, in addition to removing - comments and white-spaces, obfuscates local variables using the smallest - possible variable name. This obfuscation is safe, even when using constructs - such as 'eval' or 'with' (although the compression is not optimal is those - cases) Compared to jsmin, the average savings is around 20%. - - - - - BSD License - http://developer.yahoo.com/yui/license.html - repo - - - - - - yui-compressor-forum - http://yuilibrary.com/forum/viewforum.php?f=94/ - - - - - scm:git:git://github.com/yui/yuicompressor.git - http://github.com/yui/yuicompressor - - - - - julienlecomte - Julien Lecomte - - - isaacs - Isaac Z. Schlueter - - - - - - net.sf - jargs - 1.0 - - - - diff --git a/yuicompressor.spec b/yuicompressor.spec deleted file mode 100644 index abc56c1..0000000 --- a/yuicompressor.spec +++ /dev/null @@ -1,146 +0,0 @@ -Name: yuicompressor -Version: 2.4.8 -Release: 17%{?dist} -Summary: YUI Compressor - The Yahoo JavaScript and CSS Compressor - -# Source 0 is BSD, Source 1 is MPLv1.1 or GPLv2+ -License: BSD and (MPLv1.1 or GPLv2+) -URL: https://yui.github.com/%{name}/ -Source0: https://github.com/yui/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -# The yuicompressor uses the javascript parser from rhino. -# However, it calls private functions not exported by the -# rhino jar, so it can not use the jar provided by the -# distribution. The upstream source unjars a bundled copy of -# the rhino jar and builds using its precompiled class files. -# This violates the no precompiled sources guidelines. Only -# part of the rhino source tree is used by yuicompressor. The -# upstream sources also contains modified versions of a few -# of the rhino sources. These changes are restored by patch 0. -# Source 1 is a slimmed down version of the rhino sources of -# the same version that is bundled in the upstream sources. -# Source 2 is the script used to create Source 1. -Source1: %{name}-rhino1_7R2.tar.gz -Source2: %{name}-rhino.sh -# Man page - copied from Debian -Source3: %{name}.1 -# Pom file based on template from upstream: -# https://github.com/yui/yuicompressor/raw/master/maven_central/template/pom.xml.template -Source4: %{name}.pom -# This patch restores yuicompressor's changes to the rhino -# sources overwritten by Source 1 -Patch0: %{name}-rhino.patch -# Remove references to prebuilt jars in build.xml -Patch1: %{name}-remove-jars.patch -# Fix test script - only test yuicompressor, not rhino -Patch2: %{name}-tests.patch -# Update source and target for JDK 17 -Patch3: %{name}-java-version.patch - -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -BuildRequires: ant -BuildRequires: javapackages-local -BuildRequires: mvn(net.sf:jargs) -Provides: bundled(rhino) = 1.7R2 -# Explicit requires for javapackages-tools since yuicompressor script -# uses /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description -The YUI Compressor is a JavaScript compressor which, in addition to -removing comments and white-spaces, obfuscates local variables using -the smallest possible variable name. This obfuscation is safe, even -when using constructs such as 'eval' or 'with' (although the -compression is not optimal in those cases) Compared to jsmin, the -average savings is around 20%. - -The YUI Compressor is also able to safely compress CSS files. The -decision on which compressor is being used is made on the file -extension (js or css). - -%prep -%setup -q -a 1 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -# Remove prebuilt jars -rm -rf lib/* -ln -s $(build-classpath jargs) lib - -%build -%ant - -%install -%mvn_artifact %{SOURCE4} build/%{name}-%{version}.jar -%mvn_install - -%jpackage_script com.yahoo.platform.yui.compressor.Bootstrap "" "" jargs:%{name} %{name} true - -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 - -%check -tests/suite.sh - -%files -f .mfiles -%{_bindir}/%{name} -%doc %{_mandir}/man1/%{name}.1* -%doc README.md doc/CHANGELOG -%license LICENSE.TXT LICENSE.txt - -%changelog -* Wed Sep 21 2022 Mattias Ellert - 2.4.8-17 -- Fix test script - - Don't use /dev/stderr (permission denied) - - Replace egrep with grep -E - -* Sat Jul 23 2022 Fedora Release Engineering - 2.4.8-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 2.4.8-15 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 2.4.8-14 -- Rebuilt for java-17-openjdk as system jdk -- Update source and target for JDK 17 - -* Sat Jan 22 2022 Fedora Release Engineering - 2.4.8-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.4.8-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 2.4.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.4.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 2.4.8-9 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue May 05 2020 Mattias Ellert - 2.4.8-8 -- Update source and target for JDK 11 - -* Fri Jan 31 2020 Fedora Release Engineering - 2.4.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.4.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.4.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 31 2018 Severin Gehwolf - 2.4.8-4 -- Add explicit requirement on javapackages-tools since yuicompressor - script uses java-functions. See RHBZ#1600426. - -* Sat Jul 14 2018 Fedora Release Engineering - 2.4.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.4.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Dec 05 2017 Mattias Ellert - 2.4.8-1 -- Initial packaging for Fedora