diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 9a8ee0c..5799362 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/1.0.2.tar.gz -/jurand-1.1.0.tar.gz -/jurand-1.2.0.tar.gz -/jurand-1.3.0.tar.gz -/jurand-1.3.1.tar.gz -/jurand-1.3.2.tar.gz +SOURCES/jurand-1.3.3.tar.gz diff --git a/.jurand.metadata b/.jurand.metadata new file mode 100644 index 0000000..6026d80 --- /dev/null +++ b/.jurand.metadata @@ -0,0 +1 @@ +8ef5deaabd4eb8d46e241f30cad6d33600ee3233 SOURCES/jurand-1.3.3.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 9c4a375..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# jurand - -The jurand package diff --git a/jurand.spec b/SPECS/jurand.spec similarity index 85% rename from jurand.spec rename to SPECS/jurand.spec index ce7b3ce..a076ccc 100644 --- a/jurand.spec +++ b/SPECS/jurand.spec @@ -1,27 +1,24 @@ Name: jurand -Version: 1.3.2 -Release: 5%{?dist} +Version: 1.3.3 +Release: 6%{?dist} Summary: A tool for manipulating Java symbols License: Apache-2.0 URL: https://github.com/fedora-java/jurand Source0: https://github.com/fedora-java/jurand/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ - BuildRequires: diffutils +BuildRequires: gcc-c++ BuildRequires: make BuildRequires: rubygem-asciidoctor -Obsoletes: javapackages-extra < 6.2.0 - %description The tool can be used for patching .java sources in cases where using sed is insufficient due to Java language syntax. The tool follows Java language rules rather than applying simple regular expressions on the source code. %prep -%setup -q +%autosetup -p1 %build %{make_build} test-compile manpages @@ -44,12 +41,14 @@ make test %doc README.adoc %changelog -* Tue Oct 29 2024 Troy Dawson - 1.3.2-5 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 +* Wed Sep 04 2024 Mikolaj Izdebski - 1.3.3-4 +- Drop unneeded obsoletes -* Mon Jun 24 2024 Troy Dawson - 1.3.2-4 -- Bump release for June 2024 mass rebuild +* Tue Aug 20 2024 Marian Koncek - 1.3.3-1 +- Update to upstream version 1.3.3 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild * Wed Jan 24 2024 Fedora Release Engineering - 1.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index a9520db..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_contexts: - - osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/plan.fmf b/plans/plan.fmf deleted file mode 100644 index 1ccac40..0000000 --- a/plans/plan.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Run tests from dist-git -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources deleted file mode 100644 index 14da574..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (jurand-1.3.2.tar.gz) = 4bd0b8de73391e43c905fc3d63d9373e73ec5b3a1dd64fac746106ace262eb49db007562517d79e6dc2adaff8abb63735ad78889f7d5f1542e1cf597f6b3acf4 diff --git a/tests/macros/main.fmf b/tests/macros/main.fmf deleted file mode 100644 index 5082f3c..0000000 --- a/tests/macros/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Jurand macros test -description: | - Test whether Jurand RPM macros work. -require: - - rpm-build diff --git a/tests/macros/runtest.sh b/tests/macros/runtest.sh deleted file mode 100755 index d99da7f..0000000 --- a/tests/macros/runtest.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# Author: Mikolaj Izdebski -. /usr/share/beakerlib/beakerlib.sh - -rlJournalStart - - rlPhaseStartSetup - rlAssertRpm jurand - rlAssertRpm rpm-build - rlPhaseEnd - - rlPhaseStartTest - rlAssertGrep "^import com.Foo;$" test_template.java - rlAssertGrep "^import biz.Bar;$" test_template.java - rlAssertGrep "^@Foo$" test_template.java - rlAssertGrep "^class test{}$" test_template.java - - rlRun "cp test_template.java test.java" - rlRun -s "rpm -E '%java_remove_imports test.java -n Foo'" - rlAssertGrep /usr/bin/jurand $rlRun_LOG - rlRun "sh $rlRun_LOG" - rlAssertNotGrep "^import com.Foo;$" test.java - rlAssertGrep "^import biz.Bar;$" test.java - rlAssertGrep "^@Foo$" test.java - rlAssertGrep "^class test{}$" test.java - - rlRun "cp test_template.java test.java" - rlRun -s "rpm -E '%java_remove_annotations test.java -n Foo'" - rlAssertGrep /usr/bin/jurand $rlRun_LOG - rlRun "sh $rlRun_LOG" - rlAssertNotGrep "^import com.Foo;$" test.java - rlAssertGrep "^import biz.Bar;$" test.java - rlAssertNotGrep "^@Foo$" test.java - rlAssertGrep "^class test{}$" test.java - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "rm -f test.java" - rlPhaseEnd -rlJournalEnd -rlJournalPrintText diff --git a/tests/macros/test_template.java b/tests/macros/test_template.java deleted file mode 100644 index 87bdcaa..0000000 --- a/tests/macros/test_template.java +++ /dev/null @@ -1,4 +0,0 @@ -import com.Foo; -import biz.Bar; -@Foo -class test{} diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index 99fd67e..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,4 +0,0 @@ -contact: Mikolaj Izdebski -framework: beakerlib -test: ./runtest.sh -tier: 0 diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf deleted file mode 100644 index 0f22319..0000000 --- a/tests/smoke/main.fmf +++ /dev/null @@ -1,11 +0,0 @@ -summary: Jurand smoke test -description: | - Download Guava sources, run Jurand to remove annotations and then - compile Guava to verify that annotations were removed, producing - valid Java code that can be compiled. -require: - - wget - - tar - - gzip - - findutils - - java-21-openjdk-devel diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100755 index 32e18c5..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Author: Mikolaj Izdebski -. /usr/share/beakerlib/beakerlib.sh - -rlJournalStart - - rlPhaseStartSetup - rlAssertRpm jurand - rlAssertRpm java-21-openjdk-devel - export JAVA_HOME=/usr/lib/jvm/java-21-openjdk - rlRun "wget https://src.fedoraproject.org/lookaside/pkgs/guava/guava-31.1.tar.gz/sha512/660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8/guava-31.1.tar.gz" - rlAssertExists guava-31.1.tar.gz - rlRun "tar xf guava-31.1.tar.gz" - rlAssertExists guava-31.1 - rlPhaseEnd - - rlPhaseStartTest - rlRun "jurand -i -a guava-31.1/guava/src\ - -p org[.]checkerframework[.]\ - -p com[.]google[.]common[.]annotations[.]\ - -p com[.]google[.]errorprone[.]annotations[.]\ - -p com[.]google[.]j2objc[.]annotations[.]\ - -p javax[.]annotation[.]\ - " - rlRun -s "find guava-31.1/guava/src guava-31.1/futures/failureaccess/src -name \*.java | sort" - rlRun -s "${JAVA_HOME}/bin/javac -d . @$rlRun_LOG" - rlAssertNotGrep error: $rlRun_LOG - rlAssertExists com/google/common/base/Strings.class - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "rm -rf guava-31.1.tar.gz guava-31.1/ com/" - rlPhaseEnd -rlJournalEnd -rlJournalPrintText