diff --git a/.gitignore b/.gitignore index 259d488..bf66424 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ commons-exec-1.0.1-src.tar.gz -/commons-exec-1.1-src.tar.gz -/commons-exec-1.2-src.tar.gz -/commons-exec-1.3-src.tar.gz -/commons-exec-1.4.0-src.tar.gz -/commons-exec-1.5.0-src.tar.gz -/commons-exec-1.6.0-src.tar.gz diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 8f07024..23baf72 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,22 +2,35 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.6.0 +Version: 1.0.1 Release: 2%{?dist} Summary: Java library to reliably execute external processes from within the JVM -License: Apache-2.0 -URL: https://commons.apache.org/proper/%{short_name} + +Group: Development/Libraries +License: ASL 2.0 +URL: http://commons.apache.org/exec/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-bundle +BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-assembly +BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-idea +BuildRequires: maven2-plugin-install +BuildRequires: maven2-plugin-jar +BuildRequires: maven2-plugin-javadoc +BuildRequires: maven2-plugin-resources +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun):jpackage-utils BuildArch: noarch -ExclusiveArch: %{java_arches} noarch - -Source0: https://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz - -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) - -# Tests require /usr/bin/ping -BuildRequires: iputils %description Commons Exec is a library for dealing with external process execution and @@ -26,213 +39,72 @@ environment management in Java. %package javadoc Summary: Javadocs for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep -%autosetup -n %{short_name}-%{version}-src +%setup -q -n %{short_name}-%{version}-src -# Disable junit-pioneer features since it's not (yet) available in Fedora -%pom_remove_dep org.junit-pioneer:junit-pioneer -find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; +# Shell scripts used for unit tests must be executable (see +# http://commons.apache.org/exec/faq.html#environment-testing) +chmod a+x src/test/scripts/*.sh %build -# - Skip Exec34Test/Exec41Test/Exec60Test ("socket: Operation not permitted" on Koji) -# - Skip Exec57Test (it is unstable), see RHBZ #1202260 -# - Skip Exec65Test (calls sudo) -%mvn_build -- \ - -Dcommons.osgi.symbolicName=org.apache.commons.exec \ - -Dcommons.packageId=exec \ - -Dtest=\!org.apache.commons.exec.issues.Exec34Test,\!org.apache.commons.exec.issues.Exec41Test,\!org.apache.commons.exec.issues.Exec57Test,\!org.apache.commons.exec.issues.Exec60Test,\!org.apache.commons.exec.issues.Exec65Test +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL +mvn-jpp \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc %install -%mvn_install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} +ln -s %{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms +cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom + +%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name} -%files -f .mfiles -%license LICENSE.txt NOTICE.txt -%doc RELEASE-NOTES.txt +%clean +rm -rf $RPM_BUILD_ROOT -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt +%post +%update_maven_depmap + + +%postun +%update_maven_depmap + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt STATUS +%{_mavenpomdir}/* +%{_javadir}/*.jar +%{_mavendepmapfragdir}/* + + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name} %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Sat Jan 03 2026 Mohamed El Morabity - 1.6.0-1 -- Update to 1.6.0 - -* Tue Jul 29 2025 jiri vanek - 1.5.0-3 -- Rebuilt for java-25-openjdk as preffered jdk - -* Wed Jul 23 2025 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jul 12 2025 Mohamed El Morabity - 1.5.0-1 -- Update to 1.5.0 - -* Sun Jan 26 2025 Mohamed El Morabity - 1.4.0-1 -- Update to 1.4.0 - -* Thu Jan 16 2025 Fedora Release Engineering - 1.3-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.3-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.3-31 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 31 2024 Mikolaj Izdebski - 1.3-30 -- Port to apache-commons-parent 65 - -* Mon Jan 22 2024 Fedora Release Engineering - 1.3-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.3-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Apr 09 2023 Mohamed El Morabity - 1.3-26 -- Fix RHBZ #2171437 (FTBFS) - -* Wed Jan 18 2023 Fedora Release Engineering - 1.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.3-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1.3-23 -- Rebuilt for Drop i686 JDKs - -* Sun Feb 06 2022 Mohamed El Morabity - 1.3-22 -- Fix build with JDK 17 - -* Sat Feb 05 2022 Jiri Vanek - 1.3-21 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Jiri Vanek - 1.3-16 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Sat Jul 11 2020 Mohamed El Morabity - 1.3-15 -- Fix build with JDK-11 - -* Fri Jul 10 2020 Jiri Vanek - 1.3-14 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 08 2019 Mat Booth - 1.3-11 -- Rebuild to regenerate OSGi metadata - -* Thu Jan 31 2019 Fedora Release Engineering - 1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jun 15 2016 Mikolaj Izdebski - 1.3-5 -- Regenerate build-requires - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 16 2015 Mikolaj Izdebski - 1.3-2 -- Skip running unstable Exec57Test -- Resolves: rhbz#1202260 - -* Tue Dec 02 2014 Mohamed El Morabity - 1.3-1 -- Update to 1.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Feb 03 2014 Mohamed El Morabity - 1.2-1 -- Update to 1.2 -- Adapt to current guidelines - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 15 2013 Mat Booth - 1.1-10 -- Add missing BRs - -* Mon Jul 15 2013 Mikolaj Izdebski - 1.1-9 -- Install NOTICE file with javadoc package -- Resolves: rhbz#984417 - -* Mon Feb 18 2013 Java SIG - 1.1-8 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Feb 13 2013 Fedora Release Engineering - 1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 30 2011 Alexander Kurtakov 1.1-4 -- Build with maven 3. -- Adapt to current guidelines. - -* Mon Mar 07 2011 Tom Callaway - 1.1-3 -- fix maven fragment - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Dec 28 2010 Mohamed El Morabity - 1.1-1 -- Update to 1.1 - -* Wed Sep 1 2010 Alexander Kurtakov 1.0.1-4 -- BR iputils. Needed by tests. - -* Wed Sep 1 2010 Alexander Kurtakov 1.0.1-3 -- Change maven plugin names to the new ones. - * Wed Feb 3 2010 ELMORABITY Mohamed 1.0.1-2 - Add missing %%post/%%postun Requires - Use macro %%{_mavendepmapfragdir} instead of %%{_datadir}/maven2/pom diff --git a/sources b/sources index 6836373..ec92ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-exec-1.6.0-src.tar.gz) = 00e8eb552e886ba9da0b9636ee9ffce142eb33faa9d2873e7619e6508ab59b214bde1818f43012ecdab928ddc0697514482b33c3c268729c3049ce4306a7ea1e +b7e6651869f659345cb8e98d82747ba5 commons-exec-1.0.1-src.tar.gz