import CS jurand-1.3.3-6.module_el9+1171+eb38a622

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,6 +1 @@
-/1.0.2.tar.gz
+SOURCES/jurand-1.3.3.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

.jurand.metadata

@@ -0,0 +1 @@
+8ef5deaabd4eb8d46e241f30cad6d33600ee3233 SOURCES/jurand-1.3.3.tar.gz

README.md

@@ -1,3 +0,0 @@
-# jurand
-
-The jurand package

SPECS/jurand.spec

@@ -1,27 +1,24 @@
 Name:           jurand
-Version:        1.3.2
+Version:        1.3.3
-Release:        5%{?dist}
+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 <tdawson@redhat.com> - 1.3.2-5
+* Wed Sep 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.3-4
-- Bump release for October 2024 mass rebuild:
+- Drop unneeded obsoletes
-  Resolves: RHEL-64018
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.2-4
+* Tue Aug 20 2024 Marian Koncek <mkoncek@redhat.com> - 1.3.3-1
-- Bump release for June 2024 mass rebuild
+- Update to upstream version 1.3.3
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/plan.fmf

@@ -1,5 +0,0 @@
-summary: Run tests from dist-git
-discover:
-  how: fmf
-execute:
-  how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (jurand-1.3.2.tar.gz) = 4bd0b8de73391e43c905fc3d63d9373e73ec5b3a1dd64fac746106ace262eb49db007562517d79e6dc2adaff8abb63735ad78889f7d5f1542e1cf597f6b3acf4

tests/macros/main.fmf

@@ -1,5 +0,0 @@
-summary: Jurand macros test
-description: |
-  Test whether Jurand RPM macros work.
-require:
-  - rpm-build

tests/macros/runtest.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
-. /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

tests/macros/test_template.java

@@ -1,4 +0,0 @@
-import com.Foo;
-import biz.Bar;
-@Foo
-class test{}

tests/main.fmf

@@ -1,4 +0,0 @@
-contact: Mikolaj Izdebski <mizdebsk@redhat.com>
-framework: beakerlib
-test: ./runtest.sh
-tier: 0

tests/smoke/main.fmf

@@ -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

tests/smoke/runtest.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
-. /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