From 2ed096e504e2b593ed06ce8f943af1e29cc1233a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:03:44 +0000 Subject: [PATCH 01/59] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3b6281b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apache-commons-exec -# $Id$ -NAME := apache-commons-exec -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 36f43de..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -apache-commons-exec-1_0_1-2_fc12:HEAD:apache-commons-exec-1.0.1-2.fc12.src.rpm:1265252630 From 29343cc5150c4355778c659e28c0b534b57f3c2a Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 1 Sep 2010 01:11:24 +0300 Subject: [PATCH 02/59] - Change maven plugin names to the new ones. --- apache-commons-exec.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 23baf72..0d1c0cd 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -18,14 +18,14 @@ 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 +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-idea-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-resources-plugin Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires(post): jpackage-utils @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 34855fae4a39554bec48533461776a9e52163c03 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 1 Sep 2010 01:22:17 +0300 Subject: [PATCH 03/59] - BR iputils. Needed by tests. --- apache-commons-exec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 0d1c0cd..7aa2d52 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -26,6 +26,7 @@ BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin +BuildRequires: iputils Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires(post): jpackage-utils @@ -105,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 58cfef19fff79f580671c8d141ff70144534add2 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Wed, 29 Dec 2010 00:11:08 +0100 Subject: [PATCH 04/59] Update to 1.1 --- .gitignore | 1 + apache-commons-exec.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bf66424..8450be0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ commons-exec-1.0.1-src.tar.gz +/commons-exec-1.1-src.tar.gz diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 7aa2d52..4d13fa2 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.0.1 -Release: 4%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -12,12 +12,9 @@ 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: iputils 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: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-compiler-plugin @@ -25,8 +22,9 @@ BuildRequires: maven-idea-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-bundle BuildRequires: maven-resources-plugin -BuildRequires: iputils +BuildRequires: maven-release-plugin Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires(post): jpackage-utils @@ -106,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. diff --git a/sources b/sources index ec92ace..2d5103b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7e6651869f659345cb8e98d82747ba5 commons-exec-1.0.1-src.tar.gz +c3332b95456a5989d346d303daca2ae2 commons-exec-1.1-src.tar.gz From 7d7b768d797a476895734599903bda68af0b409b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:29:47 -0600 Subject: [PATCH 05/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 4d13fa2..af8a386 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From e231409bff2bcb82318d9245d60e91bef6a7464b Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Mon, 7 Mar 2011 14:53:41 -0500 Subject: [PATCH 06/59] fix maven fragment --- apache-commons-exec.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index af8a386..0e4f0a2 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -75,7 +75,7 @@ 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} +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} %clean @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 609d370502db43682605407a9c6fccf3ac14121b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov < Date: Wed, 30 Nov 2011 18:43:32 +0200 Subject: [PATCH 07/59] Build with maven 3. - Adapt to current guidelines. --- apache-commons-exec.spec | 42 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 0e4f0a2..b5ab720 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,14 +3,13 @@ Name: apache-commons-exec Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java library to reliably execute external processes from within the JVM 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: iputils BuildRequires: java-devel >= 1:1.6.0 @@ -27,8 +26,6 @@ BuildRequires: maven-resources-plugin BuildRequires: maven-release-plugin Requires: java >= 1:1.6.0 Requires: jpackage-utils -Requires(post): jpackage-utils -Requires(postun):jpackage-utils BuildArch: noarch %description @@ -55,55 +52,38 @@ chmod a+x src/test/scripts/*.sh %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc +mvn-rpmbuild install javadoc:javadoc %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 +cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +ln -s %{name}.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 +mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} +cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -%update_maven_depmap - - -%postun -%update_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt STATUS %{_mavenpomdir}/* %{_javadir}/*.jar %{_mavendepmapfragdir}/* - %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog +* 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 From 62b2fa4e6e9b253516098d2e386e08b28dab07ee Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:34:55 -0600 Subject: [PATCH 08/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index b5ab720..f2fe1e1 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -80,6 +80,9 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %changelog +* 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. From 5aa091574b36fa30aaabbae860e432b5a5b79d49 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 11:14:27 -0500 Subject: [PATCH 09/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index f2fe1e1..3c0b71d 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -80,6 +80,9 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %changelog +* 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 From ea24f239c4640ec5feb545a49426493a0f58b253 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:44:17 -0600 Subject: [PATCH 10/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 3c0b71d..0533125 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -80,6 +80,9 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %changelog +* 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 From c31869c8684abe6dbe6a0262322a0d9714721136 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 18 Feb 2013 13:32:37 +0000 Subject: [PATCH 11/59] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- apache-commons-exec.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 0533125..3572fd9 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -13,17 +13,8 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n BuildRequires: iputils BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-antrun-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-idea-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-plugin-bundle -BuildRequires: maven-resources-plugin -BuildRequires: maven-release-plugin +BuildRequires: jpackage-utils +BuildRequires: maven-local Requires: java >= 1:1.6.0 Requires: jpackage-utils BuildArch: noarch @@ -36,7 +27,6 @@ environment management in Java. %package javadoc Summary: Javadocs for %{name} Group: Documentation -Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc @@ -52,7 +42,7 @@ chmod a+x src/test/scripts/*.sh %build -mvn-rpmbuild install javadoc:javadoc +mvn-rpmbuild install javadoc:aggregate %install @@ -76,10 +66,15 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/* %files javadoc +%doc LICENSE.txt %{_javadocdir}/%{name} %changelog +* 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 From 94d189fd9a3fa82270d080e9da0eca36b23d9eaa Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 15 Jul 2013 16:36:26 +0100 Subject: [PATCH 12/59] Install NOTICE file with javadoc package - Resolves: rhbz#984417 --- apache-commons-exec.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 3572fd9..437944e 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -66,11 +66,15 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/* %files javadoc -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %{_javadocdir}/%{name} %changelog +* 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 From 242d2dd5684313a213989eb35a731e27e3bcadd2 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 15 Jul 2013 17:06:05 +0100 Subject: [PATCH 13/59] Add missing BRs --- apache-commons-exec.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 437944e..ca394ff 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -15,6 +15,8 @@ BuildRequires: iputils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: maven-local +BuildRequires: maven-install-plugin +BuildRequires: maven-invoker-plugin Requires: java >= 1:1.6.0 Requires: jpackage-utils BuildArch: noarch @@ -71,6 +73,9 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %changelog +* 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 From e93b0b4cb76b5bc2faf4f234c423e8aa9e8ba1b9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 20:01:43 -0500 Subject: [PATCH 14/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index ca394ff..47fa133 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -73,6 +73,9 @@ cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %changelog +* 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 From 36e8e87b905739769ff85562d6cb6ee5cfe152e2 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Tue, 4 Feb 2014 09:51:04 +0100 Subject: [PATCH 15/59] - Update to 1.2 - Adapt to current guidelines --- .gitignore | 1 + apache-commons-exec.spec | 40 ++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 8450be0..ada0b33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ commons-exec-1.0.1-src.tar.gz /commons-exec-1.1-src.tar.gz +/commons-exec-1.2-src.tar.gz diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 47fa133..9620845 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.1 -Release: 11%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -38,41 +38,41 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{short_name}-%{version}-src +# Fix wrong end-of-line encoding +for file in LICENSE.txt NOTICE.txt STATUS; do + sed -i.orig "s/\r//" $file && \ + touch -r $file.orig $file && \ + rm $file.orig +done + # 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 +%mvn_file :%{short_name} %{short_name} %{name} + %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build %install -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -ln -s %{name}.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%{_mavenpomdir} -cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom - -%add_maven_depmap JPP-%{name}.pom %{name}.jar +%mvn_install -%files +%files -f .mfiles %doc LICENSE.txt NOTICE.txt STATUS -%{_mavenpomdir}/* -%{_javadir}/*.jar -%{_mavendepmapfragdir}/* -%files javadoc + +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt -%{_javadocdir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 2d5103b..894dea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3332b95456a5989d346d303daca2ae2 commons-exec-1.1-src.tar.gz +c423f7268f3bd03c4602dc7fd12b5d4c commons-exec-1.2-src.tar.gz From 83ae95b1add1f9637f749e5fed734429969e2b1f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:04:59 +0100 Subject: [PATCH 16/59] Use Requires: java-headless rebuild (#1067528) --- apache-commons-exec.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 9620845..8a72219 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -17,7 +17,7 @@ BuildRequires: jpackage-utils BuildRequires: maven-local BuildRequires: maven-install-plugin BuildRequires: maven-invoker-plugin -Requires: java >= 1:1.6.0 +Requires: java-headless >= 1:1.6.0 Requires: jpackage-utils BuildArch: noarch @@ -69,6 +69,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From eafa608ceabc86d1266f4a02931355eddf18ae09 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:55:33 -0500 Subject: [PATCH 17/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 8a72219..6a1f197 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -69,6 +69,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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) From 46f7a5aa93c6f8256bf74bad89ae51ff6ea0d72c Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Tue, 2 Dec 2014 15:56:57 +0100 Subject: [PATCH 18/59] Update to 1.3 --- .gitignore | 1 + apache-commons-exec.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ada0b33..bfb0f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ 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 diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 6a1f197..1d5dfeb 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.2 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -39,7 +39,7 @@ This package contains the API documentation for %{name}. %setup -q -n %{short_name}-%{version}-src # Fix wrong end-of-line encoding -for file in LICENSE.txt NOTICE.txt STATUS; do +for file in LICENSE.txt NOTICE.txt RELEASE-NOTES.txt STATUS; do sed -i.orig "s/\r//" $file && \ touch -r $file.orig $file && \ rm $file.orig @@ -61,7 +61,7 @@ chmod a+x src/test/scripts/*.sh %files -f .mfiles -%doc LICENSE.txt NOTICE.txt STATUS +%doc LICENSE.txt NOTICE.txt STATUS RELEASE-NOTES.txt %files javadoc -f .mfiles-javadoc @@ -69,6 +69,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 diff --git a/sources b/sources index 894dea1..f6ee31b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c423f7268f3bd03c4602dc7fd12b5d4c commons-exec-1.2-src.tar.gz +f7d050267a75115fcc4431bd7fa567fc commons-exec-1.3-src.tar.gz From 85c1e8b5f46e6a45e8f98204cd9b6a2734a7e32c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 16 Mar 2015 10:05:12 +0100 Subject: [PATCH 19/59] Skip running unstable Exec57Test - Resolves: rhbz#1202260 --- apache-commons-exec.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 1d5dfeb..e132328 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -49,6 +49,9 @@ done # http://commons.apache.org/exec/faq.html#environment-testing) chmod a+x src/test/scripts/*.sh +# Skip Exec57Test (it is unstable), see rhbz#1202260 +find -name Exec57Test.java -delete + %mvn_file :%{short_name} %{short_name} %{name} @@ -69,6 +72,10 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From 9d9d9bcecafaa10cde5e74bf728d0d88bcd1c457 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 00:02:30 +0000 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index e132328..9d8c58f 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -72,6 +72,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 00ec588f68a94f11dc2af6da2c38743fc49b78de Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:17:13 +0000 Subject: [PATCH 21/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 9d8c58f..7c53a06 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -72,6 +72,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From e8fbcb9645242b800f0ded034449f1d385270301 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 15 Jun 2016 12:41:26 +0200 Subject: [PATCH 22/59] Regenerate build-requires --- apache-commons-exec.spec | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 7c53a06..b78d4c2 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,23 +3,21 @@ Name: apache-commons-exec Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java library to reliably execute external processes from within the JVM - -Group: Development/Libraries License: ASL 2.0 URL: http://commons.apache.org/exec/ +BuildArch: noarch + Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -BuildRequires: iputils -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils BuildRequires: maven-local -BuildRequires: maven-install-plugin -BuildRequires: maven-invoker-plugin -Requires: java-headless >= 1:1.6.0 -Requires: jpackage-utils -BuildArch: noarch +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) + +# Tests execute /usr/bin/ping +BuildRequires: iputils %description Commons Exec is a library for dealing with external process execution and @@ -28,8 +26,6 @@ environment management in Java. %package javadoc Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -72,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 64b12aa6d0de10a058d940dfa7b1eac2d96c09a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:04:06 +0000 Subject: [PATCH 23/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index b78d4c2..8aac9cf 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -68,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From f9cae699da547fc7b9a2198c3d0e32f782deadcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:59:10 +0000 Subject: [PATCH 24/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 8aac9cf..a24abcf 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -68,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 42b90895a867bfa40990d96aec6e111e5311e5ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:27:39 +0000 Subject: [PATCH 25/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index a24abcf..d392524 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -68,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From d29bbbab73d5359ead5b4d5dc0e2a91eb8392b53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:19:14 +0000 Subject: [PATCH 26/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index d392524..06d18cf 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -68,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 75bfd22e3e7e3f6c5e6346e47dde903e2495f2e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:27:51 +0000 Subject: [PATCH 27/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 06d18cf..ac9f846 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -68,6 +68,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 14b4f161064878228fd78df8f7b678ffb617be69 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 8 Feb 2019 11:44:48 +0000 Subject: [PATCH 28/59] Rebuild to regenerate OSGi metadata --- apache-commons-exec.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index ac9f846..c3bc07f 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -52,22 +52,23 @@ find -name Exec57Test.java -delete %build -%mvn_build - +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.exec %install %mvn_install - %files -f .mfiles -%doc LICENSE.txt NOTICE.txt STATUS RELEASE-NOTES.txt +%license LICENSE.txt NOTICE.txt +%doc STATUS RELEASE-NOTES.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt - +%license LICENSE.txt NOTICE.txt %changelog +* 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 From 7c98ed82cacc364ccb295e2d398ec2eedbb8b00f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:04:30 +0000 Subject: [PATCH 29/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index c3bc07f..a8d1f90 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -66,6 +66,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 9498950f32a70202a673fabce149b685b23b1e2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:44:31 +0000 Subject: [PATCH 30/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index a8d1f90..c17a24e 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -66,6 +66,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 2fff5a8f999c7f5ae8c3992f9b7992e79aac8616 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:29:58 +0200 Subject: [PATCH 31/59] Rebuilt for JDK-11 --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index c17a24e..37274cf 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -66,6 +66,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 725db0a9b4ca2fd258fd8221ce5b4068ec348c05 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sat, 11 Jul 2020 10:30:56 +0200 Subject: [PATCH 32/59] Fix build with JDK-11 --- apache-commons-exec.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 37274cf..6967f94 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -48,6 +48,9 @@ chmod a+x src/test/scripts/*.sh # Skip Exec57Test (it is unstable), see rhbz#1202260 find -name Exec57Test.java -delete +%pom_xpath_set pom:properties/pom:maven.compiler.source 6 +%pom_xpath_set pom:properties/pom:maven.compiler.target 6 + %mvn_file :%{short_name} %{short_name} %{name} @@ -66,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 83de8d17eee41219882f3bf3e8aef81383541291 Mon Sep 17 00:00:00 2001 From: Jiri Date: Mon, 13 Jul 2020 22:51:17 +0200 Subject: [PATCH 33/59] Rebuilt for JDK-11 --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 6967f94..97f01b3 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 20a46e4864eefa33a46f31d0232d4ded4fb9bbb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:10:32 +0000 Subject: [PATCH 34/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 97f01b3..0b86c78 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 3749f9b1dcbeaaab46df8a68d95ab6d652aedc60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:14:03 +0000 Subject: [PATCH 35/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 0b86c78..297278f 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 2f9d4282f2753bd4547e59ac6d7c321fe3b840c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:46:42 +0000 Subject: [PATCH 36/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 486fb88a5210225194a40f230b29750c4e8153b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:42:41 +0000 Subject: [PATCH 37/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 297278f..9443393 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 08d65f37384b32938a7fba44658993101427564b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:24:40 +0000 Subject: [PATCH 38/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 9443393..d1f0be0 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 2fc31dd8bf76f6932069e8468d2b289222b568fe Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:25:09 +0100 Subject: [PATCH 39/59] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index d1f0be0..0783b8d 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -69,6 +69,9 @@ find -name Exec57Test.java -delete %license LICENSE.txt NOTICE.txt %changelog +* 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 From 74eeda54b31140e2fce082b5807601e2af65c79e Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sun, 6 Feb 2022 19:57:37 +0100 Subject: [PATCH 40/59] Fix build with JDK 17 --- apache-commons-exec.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 0783b8d..9919aab 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -48,18 +48,17 @@ chmod a+x src/test/scripts/*.sh # Skip Exec57Test (it is unstable), see rhbz#1202260 find -name Exec57Test.java -delete -%pom_xpath_set pom:properties/pom:maven.compiler.source 6 -%pom_xpath_set pom:properties/pom:maven.compiler.target 6 - %mvn_file :%{short_name} %{short_name} %{name} %build -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.exec +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.exec -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 + %install %mvn_install + %files -f .mfiles %license LICENSE.txt NOTICE.txt %doc STATUS RELEASE-NOTES.txt @@ -68,7 +67,11 @@ find -name Exec57Test.java -delete %files javadoc -f .mfiles-javadoc %license LICENSE.txt NOTICE.txt + %changelog +* 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 From f17ccac40005837457cf6c798072d1dfb6582207 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:29:40 +0200 Subject: [PATCH 41/59] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-exec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 9919aab..a22b44f 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,11 +3,12 @@ Name: apache-commons-exec Version: 1.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz @@ -69,6 +70,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 5a153b6a8161b4057ee430ceadb1f6fbd878b494 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:59:22 +0000 Subject: [PATCH 42/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index a22b44f..04bf340 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -70,6 +70,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From dc9be74dc709fdbdb568f95b1093a988a85a0da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:54:06 +0000 Subject: [PATCH 43/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 04bf340..ec1593c 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -70,6 +70,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 10a4f5981f8d5fdb32932459b6275f0532d27cde Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 10 Apr 2023 00:08:30 +0200 Subject: [PATCH 44/59] Fix RHBZ #2171437 (FTBFS) --- apache-commons-exec.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index ec1593c..c9e0651 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -46,15 +46,18 @@ done # http://commons.apache.org/exec/faq.html#environment-testing) chmod a+x src/test/scripts/*.sh -# Skip Exec57Test (it is unstable), see rhbz#1202260 -find -name Exec57Test.java -delete %mvn_file :%{short_name} %{short_name} %{name} %build -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.exec -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 - +# - Skip Exec57Test (it is unstable), see RHBZ #1202260 +# - Skip Exec34Test/Exec41Test/Exec60Test ("socket: Operation not permitted" on Koji) +%mvn_build -- \ + -Dcommons.osgi.symbolicName=org.apache.commons.exec \ + -Dmaven.compiler.source=1.8 \ + -Dmaven.compiler.target=1.8 \ + -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 %install %mvn_install @@ -70,6 +73,9 @@ find -name Exec57Test.java -delete %changelog +* 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 From 2bc94b1f0d3e050fad032f82eee678f4d90434c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:28:32 +0000 Subject: [PATCH 45/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index c9e0651..daed0cf 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: ASL 2.0 URL: http://commons.apache.org/exec/ @@ -73,6 +73,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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) From c7786e11d45928ca53142feadbfc6bc4511767f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 25 Oct 2023 04:36:37 +0000 Subject: [PATCH 46/59] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- apache-commons-exec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index daed0cf..10f3f8c 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -5,7 +5,7 @@ Name: apache-commons-exec Version: 1.3 Release: 27%{?dist} Summary: Java library to reliably execute external processes from within the JVM -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/exec/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From b4213c29a4707977b521c881715416d350e2d25f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:12:11 +0000 Subject: [PATCH 47/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 10f3f8c..5cfb392 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -73,6 +73,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From 83fe58f6e0a4422d2f26463c7fa7656510714775 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:13:38 +0000 Subject: [PATCH 48/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 5cfb392..a7bdac5 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -73,6 +73,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From be598b6eac5da4018a2a633a6cd06c083b2116d4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jan 2024 18:58:27 +0100 Subject: [PATCH 49/59] Port to apache-commons-parent 65 --- apache-commons-exec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index a7bdac5..6d730b0 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -55,6 +55,7 @@ chmod a+x src/test/scripts/*.sh # - Skip Exec34Test/Exec41Test/Exec60Test ("socket: Operation not permitted" on Koji) %mvn_build -- \ -Dcommons.osgi.symbolicName=org.apache.commons.exec \ + -Dcommons.packageId=exec \ -Dmaven.compiler.source=1.8 \ -Dmaven.compiler.target=1.8 \ -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 @@ -73,6 +74,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From eaef360c555a559e0510f00ee16bdff0501725e5 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:43:21 +0100 Subject: [PATCH 50/59] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 6d730b0..f84fb8c 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -74,6 +74,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From 6ad5354d6f7c972a9344a9d24a04092d950cc8a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:10:59 +0000 Subject: [PATCH 51/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index f84fb8c..b5a19f3 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -74,6 +74,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From f47809d0e3de38386dade41b984f1092d4ad3c88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:15:42 +0000 Subject: [PATCH 52/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index b5a19f3..9bf54fb 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.3 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 URL: http://commons.apache.org/exec/ @@ -74,6 +74,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 From 256ecb0ff4b7825af9cbce16b5c605eb515b47f6 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 27 Jan 2025 00:17:03 +0100 Subject: [PATCH 53/59] Update to 1.4.0 --- .gitignore | 1 + apache-commons-exec.spec | 44 ++++++++++++++++------------------------ sources | 2 +- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index bfb0f37..89cc827 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 9bf54fb..84f7f1c 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,22 +2,21 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.3 -Release: 33%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 -URL: http://commons.apache.org/exec/ +URL: https://commons.apache.org/proper/%{short_name} BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source0: https://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) -# Tests execute /usr/bin/ping +# Tests require /usr/bin/ping BuildRequires: iputils %description @@ -33,32 +32,22 @@ This package contains the API documentation for %{name}. %prep -%setup -q -n %{short_name}-%{version}-src +%autosetup -n %{short_name}-%{version}-src -# Fix wrong end-of-line encoding -for file in LICENSE.txt NOTICE.txt RELEASE-NOTES.txt STATUS; do - sed -i.orig "s/\r//" $file && \ - touch -r $file.orig $file && \ - rm $file.orig -done - -# 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 - - -%mvn_file :%{short_name} %{short_name} %{name} +# 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' {} \; %build -# - Skip Exec57Test (it is unstable), see RHBZ #1202260 # - 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 \ - -Dmaven.compiler.source=1.8 \ - -Dmaven.compiler.target=1.8 \ - -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 + -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 + %install %mvn_install @@ -66,7 +55,7 @@ chmod a+x src/test/scripts/*.sh %files -f .mfiles %license LICENSE.txt NOTICE.txt -%doc STATUS RELEASE-NOTES.txt +%doc RELEASE-NOTES.txt %files javadoc -f .mfiles-javadoc @@ -74,6 +63,9 @@ chmod a+x src/test/scripts/*.sh %changelog +* 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 diff --git a/sources b/sources index f6ee31b..356dbfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7d050267a75115fcc4431bd7fa567fc commons-exec-1.3-src.tar.gz +SHA512 (commons-exec-1.4.0-src.tar.gz) = 18ec2f138100e7d029425b805093a40f9ae86362c2ce82bc828716c7c4eda6df64b17a4798afe05925d2730488b9d7cef1425d0ef5229345c77a00ffa250de9f From ab87e5b74e84de0bb67a5ff7d5f2dac05f78e469 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sat, 12 Jul 2025 02:26:46 +0200 Subject: [PATCH 54/59] Update to 1.5.0 --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 84f7f1c..36e20aa 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,7 +2,7 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.4.0 +Version: 1.5.0 Release: 1%{?dist} Summary: Java library to reliably execute external processes from within the JVM License: Apache-2.0 @@ -63,6 +63,9 @@ find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; %changelog +* 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 From c6a60064e318b27fe3f447bc4a11cd978116c0c7 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sat, 12 Jul 2025 02:41:07 +0200 Subject: [PATCH 55/59] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 89cc827..31b76e1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ commons-exec-1.0.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 diff --git a/sources b/sources index 356dbfd..64cc590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-exec-1.4.0-src.tar.gz) = 18ec2f138100e7d029425b805093a40f9ae86362c2ce82bc828716c7c4eda6df64b17a4798afe05925d2730488b9d7cef1425d0ef5229345c77a00ffa250de9f +SHA512 (commons-exec-1.5.0-src.tar.gz) = 286841b38965612c03d3697fcb131ab8cd2ff0a065f8bbb7195c120ec36d8d930aadf36ce8d1a6693fdb321b67fa82ae052c9a87d4a5519717925b1cd176ae65 From c43aadf1bc2bf5828989b7b5a1b2f3422be57787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:47 +0000 Subject: [PATCH 56/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index 36e20aa..ca3fa91 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.5.0 -Release: 1%{?dist} +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} @@ -63,6 +63,9 @@ find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; %changelog +* 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 From f59af93e5f1d091536f4c76ec268fa14a3b369df Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:04:17 +0200 Subject: [PATCH 57/59] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- apache-commons-exec.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index ca3fa91..24910a4 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?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} @@ -12,7 +12,7 @@ ExclusiveArch: %{java_arches} noarch Source0: https://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) @@ -63,6 +63,9 @@ find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; %changelog +* 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 From 87a32d479f4bf669811a84eb12a09fc942934823 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sun, 4 Jan 2026 01:41:06 +0100 Subject: [PATCH 58/59] Update to 1.6.0 --- .gitignore | 1 + apache-commons-exec.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 31b76e1..259d488 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ commons-exec-1.0.1-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 24910a4..b8d4af7 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-commons-exec -Version: 1.5.0 -Release: 3%{?dist} +Version: 1.6.0 +Release: 1%{?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} @@ -63,6 +63,9 @@ find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; %changelog +* 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 diff --git a/sources b/sources index 64cc590..6836373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-exec-1.5.0-src.tar.gz) = 286841b38965612c03d3697fcb131ab8cd2ff0a065f8bbb7195c120ec36d8d930aadf36ce8d1a6693fdb321b67fa82ae052c9a87d4a5519717925b1cd176ae65 +SHA512 (commons-exec-1.6.0-src.tar.gz) = 00e8eb552e886ba9da0b9636ee9ffce142eb33faa9d2873e7619e6508ab59b214bde1818f43012ecdab928ddc0697514482b33c3c268729c3049ce4306a7ea1e From 02ca9f41cc4e095d7e2ab6ace7a44c1d4e6e07c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:47:00 +0000 Subject: [PATCH 59/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- apache-commons-exec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index b8d4af7..8f07024 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.6.0 -Release: 1%{?dist} +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} @@ -63,6 +63,9 @@ find src/test/java/ -name "*.java" -exec sed -i '/SetSystemProperty/d' {} \; %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