Bug 2324759 - Review Request: javapackages-tools-epel - Macros and scripts for Java packaging support
Summary: Review Request: javapackages-tools-epel - Macros and scripts for Java packagi...
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: Package Review
Version: rawhide
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Neal Gompa
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks: 2324741 2324760
TreeView+ depends on / blocked
 
Reported: 2024-11-08 20:49 UTC by Michel Lind
Modified: 2024-11-17 01:32 UTC (History)
2 users (show)

Fixed In Version:
Clone Of:
Environment:
If this bug requires documentation, please select an appropriate Doc Type value.
Last Closed: 2024-11-17 01:32:01 UTC
Type: ---
Embargoed:
ngompa13: fedora-review+


Attachments (Terms of Use)

Description Michel Lind 2024-11-08 20:49:46 UTC
Spec URL: https://salimma.fedorapeople.org/javapackages-tools-epel.spec
SRPM URL: https://salimma.fedorapeople.org/javapackages-tools-epel-6.2.0-12.1.fc41.src.rpm

Description:
This package provides macros and scripts to support Java packaging.

Fedora Account System Username: salimma

Comment 1 Michel Lind 2024-11-08 21:24:47 UTC
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> - 6.2.0-12.1
+- EPEL-only package to ship ivy-local
+
 * Tue Oct 29 2024 Troy Dawson <tdawson> - 6.2.0-12
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018

Comment 2 Neal Gompa 2024-11-08 21:35:22 UTC
Taking this review.

Comment 3 Neal Gompa 2024-11-08 21:46:48 UTC
Review notes:

* Package is forked from javapackages-tools and looks largely the same
* Package builds and installs
* Package licensing is correctly handled
* No serious issues from rpmlint (though all the excludes did give me a double-take)

PACKAGE APPROVED.

Comment 4 Fedora Admin user for bugzilla script actions 2024-11-08 22:00:47 UTC
The Pagure repository was created at https://src.fedoraproject.org/rpms/javapackages-tools-epel

Comment 5 Fedora Update System 2024-11-08 22:51:04 UTC
FEDORA-EPEL-2024-9b95d53410 (javapackages-tools-epel-6.2.0-12.1.el10_0) has been submitted as an update to Fedora EPEL 10.0.
https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2024-9b95d53410

Comment 6 Fedora Update System 2024-11-09 03:11:59 UTC
FEDORA-EPEL-2024-9b95d53410 has been pushed to the Fedora EPEL 10.0 testing repository.

You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2024-9b95d53410

See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.

Comment 7 Fedora Update System 2024-11-17 01:32:01 UTC
FEDORA-EPEL-2024-9b95d53410 (javapackages-tools-epel-6.2.0-12.1.el10_0) has been pushed to the Fedora EPEL 10.0 stable repository.
If problem still persists, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.