https://bugzilla.redhat.com/show_bug.cgi?id=2324759 --- Comment #1 from Michel Lind <michel@xxxxxxxxxxxxxxx> --- Diff from the c10s spec this was based on --- /home/michel/src/centos/rpms/javapackages-tools/javapackages-tools.spec 2024-11-08 14:12:42.234665416 -0600 +++ javapackages-tools-epel.spec 2024-11-08 14:56:16.058097222 -0600 @@ -1,10 +1,5 @@ -%if 0%{?fedora} -%bcond_with xmvn_generator -%bcond_without ivy -%else %bcond_without xmvn_generator -%bcond_with ivy -%endif +%bcond_without ivy %global python_prefix python3 %global python_interpreter %{?__python3}%{!?__python3:dummy} @@ -14,9 +9,11 @@ %global maven_home %{_usr}/share/xmvn -Name: javapackages-tools +%global orig_release 12 + +Name: javapackages-tools-epel Version: 6.2.0 -Release: 12%{?dist} +Release: %{orig_release}.1%{?dist} Summary: Macros and scripts for Java packaging support License: BSD-3-Clause URL: https://github.com/fedora-java/javapackages @@ -61,7 +58,7 @@ %package -n maven-local Summary: Macros and scripts for Maven packaging support -Requires: %{name} = %{version}-%{release} +Requires: javapackages-tools = %{version}-%{release} Requires: javapackages-local = %{version}-%{release} Requires: xmvn-minimal Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) @@ -78,10 +75,11 @@ %if %{with ivy} %package -n ivy-local Summary: Local mode for Apache Ivy -Requires: %{name} = %{version}-%{release} -Requires: javapackages-local = %{version}-%{release} -Requires: apache-ivy >= 2.3.0-8 -Requires: xmvn-connector-ivy +Requires: javapackages-tools >= %{version}-%{orig_release} +Requires: javapackages-local >= %{version}-%{orig_release} +# break dependency loop by weakening these dependencies first +Recommends: apache-ivy >= 2.3.0-8 +Recommends: xmvn-connector-ivy %description -n ivy-local This package implements local mode for Apache Ivy, which allows @@ -111,7 +109,7 @@ %package -n javapackages-generators Summary: RPM dependency generators for Java packaging support -Requires: %{name} = %{version}-%{release} +Requires: javapackages-tools = %{version}-%{release} Requires: %{python_prefix}-javapackages = %{version}-%{release} Requires: %{python_interpreter} @@ -145,7 +143,7 @@ %prep %setup -q -n javapackages-%{version} -%patch0 -p1 +%patch -P0 -p1 %build %configure --pyinterpreter=%{python_interpreter} \ @@ -183,35 +181,20 @@ %check ./check -%files -f files-tools -%if 0%{?flatpak} -%{_usr}/share/java-utils -%endif - -%files -n javapackages-filesystem -f files-filesystem - -%files -n javapackages-generators -f files-generators - -%files -n javapackages-common -f files-common - -%files -n javapackages-compat -f files-compat - -%files -n javapackages-local - -%files -n maven-local - %if %{with ivy} %files -n ivy-local -f files-ivy +%exclude %{_bindir}/* +%exclude %{_datadir}/* +%exclude %{_mandir}/* +%exclude %{_prefix}/lib/* +%exclude %{python3_sitelib}/* +%exclude %{_sysconfdir}/java %endif -%files -n maven-local-openjdk21 -%dir %{maven_home}/conf -%{maven_home}/conf/toolchains.xml-openjdk21 - -%files -n %{python_prefix}-javapackages -f files-python -%license LICENSE - %changelog +* Fri Nov 08 2024 Michel Lind <salimma@xxxxxxxxxxxxxxxxx> - 6.2.0-12.1 +- EPEL-only package to ship ivy-local + * Tue Oct 29 2024 Troy Dawson <tdawson@xxxxxxxxxx> - 6.2.0-12 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 -- You are receiving this mail because: You are always notified about changes to this product and component You are on the CC list for the bug. https://bugzilla.redhat.com/show_bug.cgi?id=2324759 Report this comment as SPAM: https://bugzilla.redhat.com/enter_bug.cgi?product=Bugzilla&format=report-spam&short_desc=Report%20of%20Bug%202324759%23c1 -- _______________________________________________ package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/package-review@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
