From bf3960a77b88ad4cc63caacb70db48b9369d0769 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 28 Apr 2011 11:26:33 -0600 Subject: [PATCH 01/45] Add needed requires to core --- apache-rat.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 0c2dca4..6478473 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 0.6.%{snapdate}%{?dist} +Release: 0.7.%{snapdate}%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -64,6 +64,12 @@ or apache-rat-plugin. Summary: Core functionality for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: apache-commons-cli +Requires: apache-commons-collections +Requires: apache-commons-compress +Requires: apache-commons-lang +Requires: apache-commons-io +Requires: junit Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -187,6 +193,9 @@ cp -rp target/site/apidocs \ %changelog +* Thu Apr 28 2011 Orion Poplawski 0.8-0.7.20100827 +- Add needed requires to core + * Thu Mar 3 2011 Orion Poplawski 0.8-0.6.20100827 - Drop unneeded rm from %%install - Don't ship BUILD.txt From 035924db1217bf40f1dae2d28c85335bf5aab52d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 6 Dec 2011 15:08:21 -0700 Subject: [PATCH 02/45] Add needed requires to core --- .gitignore | 1 + apache-rat.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 184fa04..cca543f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apache-rat-0.8-20100827.tar.bz2 +/apache-rat-incubating-0.8-src.tar.bz2 diff --git a/apache-rat.spec b/apache-rat.spec index 6478473..e2b26b1 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 0.7.%{snapdate}%{?dist} +Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -11,9 +11,8 @@ License: ASL 2.0 URL: http://incubator.apache.org/rat/ #svn had a number of needed bugfixes #svn export -r 990212 http://svn.apache.org/repos/asf/incubator/rat/main/trunk apache-rat-0.8-20100707 -Source0: %{name}-%{version}-%{snapdate}.tar.bz2 -#This is 0.7 -#Source0: http://www.apache.org/dist/incubator/rat/apache-rat-incubating-current-src.tar.bz2 +#Source0: %{name}-%{version}-%{snapdate}.tar.bz2 +Source0: http://www.apache.org/dist/incubator/rat/sources/apache-rat-incubating-%{version}-src.tar.bz2 Patch0: apache-rat-0.8-doxia-1.1.patch Patch2: apache-rat-0.8-test.patch BuildArch: noarch @@ -25,6 +24,7 @@ BuildRequires: maven-antrun-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-dependency-plugin BuildRequires: maven-install-plugin +BuildRequires: maven-invoker-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-plugin @@ -109,7 +109,7 @@ This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{version}-%{snapdate} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .doxia-1.1 %patch2 -p1 -b .test @@ -136,11 +136,11 @@ cp -p pom.xml \ #Components for jarname in %{name}{-core,-plugin,-tasks} do - jarfile=$jarname/target/${jarname}-%{version}-SNAPSHOT.jar + jarfile=$jarname/target/${jarname}-%{version}.jar cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar cp -p ${jarname}/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom - %add_to_maven_depmap org.apache.rat ${jarname} %{version}-SNAPSHOT JPP/%{name} ${jarname} + %add_to_maven_depmap org.apache.rat ${jarname} %{version} JPP/%{name} ${jarname} done #Ant taksks @@ -193,6 +193,10 @@ cp -rp target/site/apidocs \ %changelog +* Tue Dec 6 2011 Orion Poplawski 0.8-1 +- Update to 0.8 release +- Add BR maven-invoker-plugin + * Thu Apr 28 2011 Orion Poplawski 0.8-0.7.20100827 - Add needed requires to core diff --git a/sources b/sources index d4778af..85d2a0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11571271e3e0da9f52673916b9a45a00 apache-rat-0.8-20100827.tar.bz2 +22a46f414444a7935ea2f507ca3677e3 apache-rat-incubating-0.8-src.tar.bz2 From 2257c020cc36384cc59bcb68880f7050e0c5c486 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 7 Dec 2011 10:21:34 -0700 Subject: [PATCH 03/45] Update to maven 3 --- apache-rat-compat.patch | 15 +++++++++++++++ apache-rat.spec | 39 +++++++++++---------------------------- 2 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 apache-rat-compat.patch diff --git a/apache-rat-compat.patch b/apache-rat-compat.patch new file mode 100644 index 0000000..ffe23d8 --- /dev/null +++ b/apache-rat-compat.patch @@ -0,0 +1,15 @@ +diff -up apache-rat-0.8/apache-rat-plugin/pom.xml.compat apache-rat-0.8/apache-rat-plugin/pom.xml +--- apache-rat-0.8/apache-rat-plugin/pom.xml.compat 2011-11-08 22:14:36.000000000 -0700 ++++ apache-rat-0.8/apache-rat-plugin/pom.xml 2011-12-06 16:35:28.068167192 -0700 +@@ -122,6 +122,10 @@ + maven-plugin-testing-harness + 1.1 + ++ ++ org.apache.maven ++ maven-compat ++ + + + +diff -up apache-rat-0.8/pom.xml.compat apache-rat-0.8/pom.xml diff --git a/apache-rat.spec b/apache-rat.spec index e2b26b1..0265733 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -14,12 +14,13 @@ URL: http://incubator.apache.org/rat/ #Source0: %{name}-%{version}-%{snapdate}.tar.bz2 Source0: http://www.apache.org/dist/incubator/rat/sources/apache-rat-incubating-%{version}-src.tar.bz2 Patch0: apache-rat-0.8-doxia-1.1.patch +Patch1: apache-rat-compat.patch Patch2: apache-rat-0.8-test.patch BuildArch: noarch BuildRequires: jpackage-utils BuildRequires: java-devel -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-antrun-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-dependency-plugin @@ -43,9 +44,6 @@ BuildRequires: apache-commons-compress Requires: jpackage-utils Requires: java -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - %description Release Audit Tool (RAT) is a tool to improve accuracy and efficiency when checking releases. It is heuristic in nature: making guesses about possible @@ -70,30 +68,24 @@ Requires: apache-commons-compress Requires: apache-commons-lang Requires: apache-commons-io Requires: junit -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description core The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. %package plugin -Summary: Maven 2 plugin for %{name} +Summary: Maven plugin for %{name} Group: Development/Libraries Requires: %{name}-core = %{version}-%{release} -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description plugin -Maven 2 plugin for running RAT, the Release Audit Tool. +Maven plugin for running RAT, the Release Audit Tool. %package tasks Summary: Ant tasks for %{name} Group: Development/Libraries Requires: %{name}-core = %{version}-%{release} -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description tasks Ant tasks for running RAT. @@ -111,17 +103,12 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .doxia-1.1 +%patch1 -p1 -b .compat %patch2 -p1 -b .test %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ --Dmaven.repo.local=$MAVEN_REPO_LOCAL \ --Dmaven.test.failure.ignore=true \ -install javadoc:aggregate +mvn-rpmbuild install javadoc:aggregate %install #Dirs @@ -131,7 +118,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} #Parent pom cp -p pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%add_to_maven_depmap org.apache.rat apache-rat-project %{version} JPP/%{name} %{name} +%add_maven_depmap JPP.%{name}-%{name}.pom #Components for jarname in %{name}{-core,-plugin,-tasks} @@ -140,7 +127,7 @@ do cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar cp -p ${jarname}/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom - %add_to_maven_depmap org.apache.rat ${jarname} %{version} JPP/%{name} ${jarname} + %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar done #Ant taksks @@ -153,13 +140,6 @@ cp -rp target/site/apidocs \ $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - - %files %defattr(-,root,root,-) %doc DISCLAIMER.txt LICENSE NOTICE README.txt RELEASE_NOTES.txt @@ -193,6 +173,9 @@ cp -rp target/site/apidocs \ %changelog +* Wed Dec 7 2011 Orion Poplawski 0.8-2 +- Update to maven 3 + * Tue Dec 6 2011 Orion Poplawski 0.8-1 - Update to 0.8 release - Add BR maven-invoker-plugin From d702e2bfe944fcdb1be75077ffc607a30393c543 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 7 Dec 2011 10:22:05 -0700 Subject: [PATCH 04/45] Bump release --- apache-rat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 0265733..9708f6e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries From 3102957aa49db78a278eef301e0406c2c97d0f82 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:37:55 -0600 Subject: [PATCH 05/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 9708f6e..d88347d 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -173,6 +173,9 @@ cp -rp target/site/apidocs \ %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Dec 7 2011 Orion Poplawski 0.8-2 - Update to maven 3 From c7d356f460c0d6857d382310e5832c5cc65c4740 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 11:21:06 -0500 Subject: [PATCH 06/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index d88347d..1a0610e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -173,6 +173,9 @@ cp -rp target/site/apidocs \ %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 00fcf14c39f5da5a6fe504bd3fb2547c470fc50b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Aug 2012 10:26:57 +0200 Subject: [PATCH 07/45] Install NOTICE files - Remove defattr --- apache-rat.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 1a0610e..002c9fb 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -141,38 +141,37 @@ cp -rp target/site/apidocs \ %files -%defattr(-,root,root,-) %doc DISCLAIMER.txt LICENSE NOTICE README.txt RELEASE_NOTES.txt %{_mavenpomdir}/JPP.%{name}-%{name}.pom %{_mavendepmapfragdir}/* %dir %{_javadir}/%{name} %files core -%defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}-core.pom %{_javadir}/%{name}/%{name}-core.jar %files plugin -%defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}-plugin.pom %{_javadir}/%{name}/%{name}-plugin.jar %files tasks -%defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE NOTICE %{_sysconfdir}/ant.d/%{name} %{_mavenpomdir}/JPP.%{name}-%{name}-tasks.pom %{_javadir}/%{name}/%{name}-tasks.jar %files javadoc -%defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE NOTICE %{_javadocdir}/%{name} %changelog +* Thu Aug 16 2012 Mikolaj Izdebski - 0.8-5 +- Install NOTICE files +- Remove defattr + * Wed Jul 18 2012 Fedora Release Engineering - 0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 2572711723c15d10540ebc5cce470d802f20b338 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Aug 2012 14:05:13 +0200 Subject: [PATCH 08/45] Run mvn-rpmbuild package instead of install This works around a FTBFS (failing integration tests). --- apache-rat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 002c9fb..cd515e7 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -108,7 +108,7 @@ This package contains the API documentation for %{name}. %build -mvn-rpmbuild install javadoc:aggregate +mvn-rpmbuild package javadoc:aggregate %install #Dirs @@ -168,6 +168,9 @@ cp -rp target/site/apidocs \ %changelog +* Thu Aug 16 2012 Mikolaj Izdebski - 0.8-6 +- Run mvn-rpmbuild package instead of install + * Thu Aug 16 2012 Mikolaj Izdebski - 0.8-5 - Install NOTICE files - Remove defattr From 6043dfdfecd8da39761769772048451f40ab748c Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 6 Feb 2013 19:34:02 +0100 Subject: [PATCH 09/45] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- apache-rat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index cd515e7..915d83e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -20,7 +20,7 @@ BuildArch: noarch BuildRequires: jpackage-utils BuildRequires: java-devel -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-antrun-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-dependency-plugin @@ -168,6 +168,10 @@ cp -rp target/site/apidocs \ %changelog +* Wed Feb 06 2013 Java SIG - 0.8-7 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Thu Aug 16 2012 Mikolaj Izdebski - 0.8-6 - Run mvn-rpmbuild package instead of install From 2978d67b1cfa4f91143f24f2a091daffb77413c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:49:30 -0600 Subject: [PATCH 10/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 915d83e..27a1105 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -168,6 +168,9 @@ cp -rp target/site/apidocs \ %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Feb 06 2013 Java SIG - 0.8-7 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From 72ee9ee6abe68f5e1b7218708ed132059b33c4a3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 13 Feb 2013 22:03:22 -0700 Subject: [PATCH 11/45] Add apache-rat wrapper script to apache-rat-core (bug #907782) Disable tests for now due to Fedora maven bug --- apache-rat.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 915d83e..637eee5 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,12 +3,12 @@ Name: apache-rat Version: 0.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries License: ASL 2.0 -URL: http://incubator.apache.org/rat/ +URL: http://creadur.apache.org/rat/ #svn had a number of needed bugfixes #svn export -r 990212 http://svn.apache.org/repos/asf/incubator/rat/main/trunk apache-rat-0.8-20100707 #Source0: %{name}-%{version}-%{snapdate}.tar.bz2 @@ -71,6 +71,8 @@ Requires: junit %description core The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. +It also includes a wrapper script "apache-rat" that should be the equivalent +to running upstream's "java -jar apache-rat.jar". %package plugin @@ -108,7 +110,7 @@ This package contains the API documentation for %{name}. %build -mvn-rpmbuild package javadoc:aggregate +mvn-rpmbuild -DskipTests=true package javadoc:aggregate %install #Dirs @@ -130,6 +132,9 @@ do %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar done +#Wrapper script +%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true + #Ant taksks mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} @@ -149,6 +154,7 @@ cp -rp target/site/apidocs \ %files core %doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}-core.pom +%{_bindir}/%{name} %{_javadir}/%{name}/%{name}-core.jar %files plugin @@ -168,6 +174,10 @@ cp -rp target/site/apidocs \ %changelog +* Tue Feb 12 2013 Orion Poplawski 0.8-8 +- Add apache-rat wrapper script to apache-rat-core (bug #907782) +- Disable tests for now due to Fedora maven bug + * Wed Feb 06 2013 Java SIG - 0.8-7 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From 52be0455187e13a023e1d03a90af21b4cc54293d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 26 Feb 2013 09:31:11 -0700 Subject: [PATCH 12/45] Drop BR on maven-doxia and maven-doxia-sitetools (bug #915606) --- apache-rat.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 637eee5..c589f92 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -33,8 +33,6 @@ BuildRequires: maven-resources-plugin BuildRequires: maven-site-plugin BuildRequires: maven-source-plugin BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-doxia -BuildRequires: maven-doxia-sitetools BuildRequires: maven-wagon BuildRequires: ant-antunit @@ -174,6 +172,9 @@ cp -rp target/site/apidocs \ %changelog +* Tue Feb 26 2013 Orion Poplawski 0.8-9 +- Drop BR on maven-doxia and maven-doxia-sitetools (bug #915606) + * Tue Feb 12 2013 Orion Poplawski 0.8-8 - Add apache-rat wrapper script to apache-rat-core (bug #907782) - Disable tests for now due to Fedora maven bug From 60f8f67afe6403ed92cd73a4fc5cb15a6c1d7d36 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 11 Jun 2013 10:29:36 -0600 Subject: [PATCH 13/45] Split up depmap fragments (bug 973242) --- apache-rat.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index c589f92..5b3bd4b 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -121,13 +121,14 @@ cp -p pom.xml \ %add_maven_depmap JPP.%{name}-%{name}.pom #Components -for jarname in %{name}{-core,-plugin,-tasks} +for comp in core plugin tasks do + jarname=%{name}-${comp} jarfile=$jarname/target/${jarname}-%{version}.jar cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar cp -p ${jarname}/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom - %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar + %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar -f ${comp} done #Wrapper script @@ -146,24 +147,27 @@ cp -rp target/site/apidocs \ %files %doc DISCLAIMER.txt LICENSE NOTICE README.txt RELEASE_NOTES.txt %{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavendepmapfragdir}/* +%{_mavendepmapfragdir}/%{name} %dir %{_javadir}/%{name} %files core %doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}-core.pom +%{_mavendepmapfragdir}/%{name}-core %{_bindir}/%{name} %{_javadir}/%{name}/%{name}-core.jar %files plugin %doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}-plugin.pom +%{_mavendepmapfragdir}/%{name}-plugin %{_javadir}/%{name}/%{name}-plugin.jar %files tasks %doc LICENSE NOTICE %{_sysconfdir}/ant.d/%{name} %{_mavenpomdir}/JPP.%{name}-%{name}-tasks.pom +%{_mavendepmapfragdir}/%{name}-tasks %{_javadir}/%{name}/%{name}-tasks.jar %files javadoc @@ -172,6 +176,9 @@ cp -rp target/site/apidocs \ %changelog +* Tue Jun 11 2013 Orion Poplawski 0.8-10 +- Split up depmap fragments (bug 973242) + * Tue Feb 26 2013 Orion Poplawski 0.8-9 - Drop BR on maven-doxia and maven-doxia-sitetools (bug #915606) From 2de96bfce392139bc92a29c47f3117f623acf91b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 20:25:31 -0500 Subject: [PATCH 14/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 5b3bd4b..9cf222e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -3,7 +3,7 @@ Name: apache-rat Version: 0.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -176,6 +176,9 @@ cp -rp target/site/apidocs \ %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jun 11 2013 Orion Poplawski 0.8-10 - Split up depmap fragments (bug 973242) From da1ea20a1606fe67fad22687987a8a2f84049c73 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 Aug 2013 11:54:17 -0600 Subject: [PATCH 15/45] Update to 0.9 --- .gitignore | 1 + apache-rat-0.8-doxia-1.1.patch | 11 ----------- apache-rat-compat.patch | 15 --------------- apache-rat.spec | 15 +++++++-------- sources | 2 +- 5 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 apache-rat-0.8-doxia-1.1.patch delete mode 100644 apache-rat-compat.patch diff --git a/.gitignore b/.gitignore index cca543f..53b8e97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apache-rat-0.8-20100827.tar.bz2 /apache-rat-incubating-0.8-src.tar.bz2 +/apache-rat-0.9-src.tar.bz2 diff --git a/apache-rat-0.8-doxia-1.1.patch b/apache-rat-0.8-doxia-1.1.patch deleted file mode 100644 index d7f9556..0000000 --- a/apache-rat-0.8-doxia-1.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-rat-0.8-20100827/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java.doxia-1.1 2010-02-07 17:34:00.000000000 -0700 -+++ apache-rat-0.8-20100827/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java 2010-09-02 10:57:24.904400746 -0600 -@@ -39,7 +39,7 @@ - import org.apache.maven.artifact.resolver.ArtifactResolver; - import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; - import org.apache.maven.artifact.versioning.VersionRange; --import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; -+import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.Body; - import org.apache.maven.doxia.site.decoration.DecorationModel; - import org.apache.maven.doxia.site.decoration.Skin; diff --git a/apache-rat-compat.patch b/apache-rat-compat.patch deleted file mode 100644 index ffe23d8..0000000 --- a/apache-rat-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up apache-rat-0.8/apache-rat-plugin/pom.xml.compat apache-rat-0.8/apache-rat-plugin/pom.xml ---- apache-rat-0.8/apache-rat-plugin/pom.xml.compat 2011-11-08 22:14:36.000000000 -0700 -+++ apache-rat-0.8/apache-rat-plugin/pom.xml 2011-12-06 16:35:28.068167192 -0700 -@@ -122,6 +122,10 @@ - maven-plugin-testing-harness - 1.1 - -+ -+ org.apache.maven -+ maven-compat -+ - - - -diff -up apache-rat-0.8/pom.xml.compat apache-rat-0.8/pom.xml diff --git a/apache-rat.spec b/apache-rat.spec index 9cf222e..440d2b8 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -2,8 +2,8 @@ #svn 990212. Name: apache-rat -Version: 0.8 -Release: 11%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -12,9 +12,7 @@ URL: http://creadur.apache.org/rat/ #svn had a number of needed bugfixes #svn export -r 990212 http://svn.apache.org/repos/asf/incubator/rat/main/trunk apache-rat-0.8-20100707 #Source0: %{name}-%{version}-%{snapdate}.tar.bz2 -Source0: http://www.apache.org/dist/incubator/rat/sources/apache-rat-incubating-%{version}-src.tar.bz2 -Patch0: apache-rat-0.8-doxia-1.1.patch -Patch1: apache-rat-compat.patch +Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 Patch2: apache-rat-0.8-test.patch BuildArch: noarch @@ -102,8 +100,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .doxia-1.1 -%patch1 -p1 -b .compat %patch2 -p1 -b .test @@ -145,7 +141,7 @@ cp -rp target/site/apidocs \ %files -%doc DISCLAIMER.txt LICENSE NOTICE README.txt RELEASE_NOTES.txt +%doc LICENSE NOTICE README.txt RELEASE_NOTES.txt %{_mavenpomdir}/JPP.%{name}-%{name}.pom %{_mavendepmapfragdir}/%{name} %dir %{_javadir}/%{name} @@ -176,6 +172,9 @@ cp -rp target/site/apidocs \ %changelog +* Fri Aug 9 2013 Orion Poplawski 0.9-1 +- Update to 0.9 + * Sat Aug 03 2013 Fedora Release Engineering - 0.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 85d2a0e..22e2d34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22a46f414444a7935ea2f507ca3677e3 apache-rat-incubating-0.8-src.tar.bz2 +d41c8a80a1d865899cfbed77d6ca7597 apache-rat-0.9-src.tar.bz2 From 2eb2593e82322fd131e337bbd7a7a2e69edfe0c6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 3 Sep 2013 14:56:46 -0600 Subject: [PATCH 16/45] Update to 0.10 --- .gitignore | 1 + apache-rat.spec | 11 ++++------- sources | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 53b8e97..5fa6b8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /apache-rat-0.8-20100827.tar.bz2 /apache-rat-incubating-0.8-src.tar.bz2 /apache-rat-0.9-src.tar.bz2 +/apache-rat-0.10-src.tar.bz2 diff --git a/apache-rat.spec b/apache-rat.spec index 440d2b8..23fce6e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,17 +1,11 @@ -%global snapdate 20100827 -#svn 990212. - Name: apache-rat -Version: 0.9 +Version: 0.10 Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries License: ASL 2.0 URL: http://creadur.apache.org/rat/ -#svn had a number of needed bugfixes -#svn export -r 990212 http://svn.apache.org/repos/asf/incubator/rat/main/trunk apache-rat-0.8-20100707 -#Source0: %{name}-%{version}-%{snapdate}.tar.bz2 Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 Patch2: apache-rat-0.8-test.patch BuildArch: noarch @@ -172,6 +166,9 @@ cp -rp target/site/apidocs \ %changelog +* Tue Sep 3 2013 Orion Poplawski 0.10-1 +- Update to 0.10 + * Fri Aug 9 2013 Orion Poplawski 0.9-1 - Update to 0.9 diff --git a/sources b/sources index 22e2d34..b579645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d41c8a80a1d865899cfbed77d6ca7597 apache-rat-0.9-src.tar.bz2 +58f17a69466053fcca3e8b80838a3c64 apache-rat-0.10-src.tar.bz2 From 9a8eb7800290c049d120f01f39bf1346c22920f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Oct 2013 14:18:35 +0200 Subject: [PATCH 17/45] Add missing BR - Update to current packaging guidelines --- apache-rat.spec | 136 +++++++++++++++++++----------------------------- 1 file changed, 53 insertions(+), 83 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 23fce6e..2172cbb 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -10,29 +10,36 @@ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{ Patch2: apache-rat-0.8-test.patch BuildArch: noarch -BuildRequires: jpackage-utils -BuildRequires: java-devel BuildRequires: maven-local -BuildRequires: maven-antrun-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-dependency-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-invoker-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-plugin-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-wagon - -BuildRequires: ant-antunit -BuildRequires: ant-testutil -BuildRequires: apache-commons-compress - -Requires: jpackage-utils -Requires: java +BuildRequires: mvn(commons-cli:commons-cli) +BuildRequires: mvn(commons-collections:commons-collections) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.ant:ant-antunit) +BuildRequires: mvn(org.apache.ant:ant-testutil) +BuildRequires: mvn(org.apache:apache) +BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.maven.doxia:doxia-core) +BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) +BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact-manager) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) +BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) %description Release Audit Tool (RAT) is a tool to improve accuracy and efficiency when @@ -50,14 +57,6 @@ or apache-rat-plugin. %package core Summary: Core functionality for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: apache-commons-cli -Requires: apache-commons-collections -Requires: apache-commons-compress -Requires: apache-commons-lang -Requires: apache-commons-io -Requires: junit %description core The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. @@ -67,8 +66,6 @@ to running upstream's "java -jar apache-rat.jar". %package plugin Summary: Maven plugin for %{name} -Group: Development/Libraries -Requires: %{name}-core = %{version}-%{release} %description plugin Maven plugin for running RAT, the Release Audit Tool. @@ -76,8 +73,6 @@ Maven plugin for running RAT, the Release Audit Tool. %package tasks Summary: Ant tasks for %{name} -Group: Development/Libraries -Requires: %{name}-core = %{version}-%{release} %description tasks Ant tasks for running RAT. @@ -85,8 +80,6 @@ Ant tasks for running RAT. %package javadoc Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -96,30 +89,21 @@ This package contains the API documentation for %{name}. %setup -q -n %{name}-%{version} %patch2 -p1 -b .test +# apache-rat is a module bundling other RAT modules together and as +# such it is not needed. +%pom_disable_module apache-rat + +# maven-antrun-plugin is used for running tests only and tests are +# skipped anyways. See rhbz#988561 +%pom_remove_plugin :maven-antrun-plugin apache-rat-tasks + %build -mvn-rpmbuild -DskipTests=true package javadoc:aggregate +# Tests are skipped because of incompatibility with Maven 3 +%mvn_build -s -f %install -#Dirs -mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} - -#Parent pom -cp -p pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%add_maven_depmap JPP.%{name}-%{name}.pom - -#Components -for comp in core plugin tasks -do - jarname=%{name}-${comp} - jarfile=$jarname/target/${jarname}-%{version}.jar - cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar - cp -p ${jarname}/pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom - %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar -f ${comp} -done +%mvn_install #Wrapper script %jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true @@ -128,44 +112,30 @@ done mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} -#Javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/ -cp -rp target/site/apidocs \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%files -f .mfiles-%{name}-project +%doc LICENSE NOTICE -%files -%doc LICENSE NOTICE README.txt RELEASE_NOTES.txt -%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files core -f .mfiles-%{name}-core +%doc README.txt RELEASE_NOTES.txt +%doc LICENSE NOTICE %dir %{_javadir}/%{name} - -%files core -%doc LICENSE NOTICE -%{_mavenpomdir}/JPP.%{name}-%{name}-core.pom -%{_mavendepmapfragdir}/%{name}-core %{_bindir}/%{name} -%{_javadir}/%{name}/%{name}-core.jar -%files plugin -%doc LICENSE NOTICE -%{_mavenpomdir}/JPP.%{name}-%{name}-plugin.pom -%{_mavendepmapfragdir}/%{name}-plugin -%{_javadir}/%{name}/%{name}-plugin.jar +%files plugin -f .mfiles-%{name}-plugin -%files tasks -%doc LICENSE NOTICE +%files tasks -f .mfiles-%{name}-tasks %{_sysconfdir}/ant.d/%{name} -%{_mavenpomdir}/JPP.%{name}-%{name}-tasks.pom -%{_mavendepmapfragdir}/%{name}-tasks -%{_javadir}/%{name}/%{name}-tasks.jar -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE -%{_javadocdir}/%{name} %changelog +* Thu Oct 3 2013 Mikolaj Izdebski - 0.10-2 +- Add missing BR +- Update to current packaging guidelines + * Tue Sep 3 2013 Orion Poplawski 0.10-1 - Update to 0.10 From 101cdadcd72db4c2e235be7456ba1ca463ea2583 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Mar 2014 17:12:31 +0100 Subject: [PATCH 18/45] Remove wagon-ssh extension from POM --- apache-rat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 2172cbb..6cc101c 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -38,7 +38,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) -BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) %description @@ -97,6 +96,8 @@ This package contains the API documentation for %{name}. # skipped anyways. See rhbz#988561 %pom_remove_plugin :maven-antrun-plugin apache-rat-tasks +# wagon-ssh is not needed in Fedora. +%pom_xpath_remove pom:extensions %build # Tests are skipped because of incompatibility with Maven 3 @@ -132,6 +133,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Fri Mar 14 2014 Mikolaj Izdebski - 0.10-3 +- Remove wagon-ssh extension from POM + * Thu Oct 3 2013 Mikolaj Izdebski - 0.10-2 - Add missing BR - Update to current packaging guidelines From 2962ac1606a8a508bb5c7bf1ff03ad322d70fe30 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 20:03:47 -0500 Subject: [PATCH 19/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 6cc101c..49621f5 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -133,6 +133,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 14 2014 Mikolaj Izdebski - 0.10-3 - Remove wagon-ssh extension from POM From 28bacdb140e9baac6346c2ada01717f7aecdc6c5 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 13 Jun 2014 09:44:42 +0200 Subject: [PATCH 20/45] Fix FTBFS (Resolves: #1105955) --- apache-rat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 49621f5..28ab216 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -19,7 +19,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.ant:ant-antunit) BuildRequires: mvn(org.apache.ant:ant-testutil) -BuildRequires: mvn(org.apache:apache) +BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.maven.doxia:doxia-core) BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) @@ -133,6 +133,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Fri Jun 13 2014 Michal Srb - 0.10-5 +- Fix FTBFS (Resolves: #1105955) + * Sat Jun 07 2014 Fedora Release Engineering - 0.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 07bcedf7c6467afe34f01e074426df7a7b18b40f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Aug 2014 14:28:14 +0200 Subject: [PATCH 21/45] Update to Maven Doxia 1.6 --- 0001-Update-to-Maven-Doxia-1.6.patch | 30 ++++++++++++++++++++++++++++ apache-rat.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Update-to-Maven-Doxia-1.6.patch diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch new file mode 100644 index 0000000..4afc262 --- /dev/null +++ b/0001-Update-to-Maven-Doxia-1.6.patch @@ -0,0 +1,30 @@ +From c6e8903a7ed5df9a4e2f7ec212c91da1981161a2 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 11 Aug 2014 14:26:34 +0200 +Subject: [PATCH] Update to Maven Doxia 1.6 + +--- + apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +index 0394c8a..af97882 100644 +--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java ++++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +@@ -27,12 +27,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; + import org.apache.maven.artifact.resolver.ArtifactResolver; + import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; + import org.apache.maven.artifact.versioning.VersionRange; +-import org.apache.maven.doxia.sink.render.RenderingContext; + import org.apache.maven.doxia.site.decoration.Body; + import org.apache.maven.doxia.site.decoration.DecorationModel; + import org.apache.maven.doxia.site.decoration.Skin; + import org.apache.maven.doxia.siterenderer.Renderer; + import org.apache.maven.doxia.siterenderer.RendererException; ++import org.apache.maven.doxia.siterenderer.RenderingContext; + import org.apache.maven.doxia.siterenderer.SiteRenderingContext; + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.plugin.MojoExecutionException; +-- +1.9.3 + diff --git a/apache-rat.spec b/apache-rat.spec index 28ab216..51ebbe3 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -8,6 +8,7 @@ License: ASL 2.0 URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 Patch2: apache-rat-0.8-test.patch +Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch BuildRequires: maven-local @@ -87,6 +88,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} %patch2 -p1 -b .test +%patch3 -p1 # apache-rat is a module bundling other RAT modules together and as # such it is not needed. @@ -133,6 +135,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Mon Aug 11 2014 Mikolaj Izdebski - 0.10-6 +- Update to Maven Doxia 1.6 + * Fri Jun 13 2014 Michal Srb - 0.10-5 - Fix FTBFS (Resolves: #1105955) From 63b5ecde415c1f52e5e4526701d1afd1267e0063 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 18 Feb 2015 14:29:30 +0100 Subject: [PATCH 22/45] Update to upstream version 0.11 --- .gitignore | 1 + 0001-Update-to-Maven-Doxia-1.6.patch | 32 ++++++++++++++-------------- apache-rat-0.8-test.patch | 20 ----------------- apache-rat.spec | 12 +++++++---- sources | 2 +- 5 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 apache-rat-0.8-test.patch diff --git a/.gitignore b/.gitignore index 5fa6b8c..d71dda4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /apache-rat-incubating-0.8-src.tar.bz2 /apache-rat-0.9-src.tar.bz2 /apache-rat-0.10-src.tar.bz2 +/apache-rat-0.11-src.tar.bz2 diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch index 4afc262..c55f2fd 100644 --- a/0001-Update-to-Maven-Doxia-1.6.patch +++ b/0001-Update-to-Maven-Doxia-1.6.patch @@ -1,4 +1,4 @@ -From c6e8903a7ed5df9a4e2f7ec212c91da1981161a2 Mon Sep 17 00:00:00 2001 +From 0afc2d821039be592828553aa031f8280e701b27 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Aug 2014 14:26:34 +0200 Subject: [PATCH] Update to Maven Doxia 1.6 @@ -8,23 +8,23 @@ Subject: [PATCH] Update to Maven Doxia 1.6 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -index 0394c8a..af97882 100644 +index a9e5aa9..6ea74c1 100644 --- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -@@ -27,12 +27,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import org.apache.maven.artifact.resolver.ArtifactResolver; - import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; - import org.apache.maven.artifact.versioning.VersionRange; --import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.Body; - import org.apache.maven.doxia.site.decoration.DecorationModel; - import org.apache.maven.doxia.site.decoration.Skin; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; +@@ -39,12 +39,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; + import org.apache.maven.artifact.resolver.ArtifactResolver; + import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; + import org.apache.maven.artifact.versioning.VersionRange; +-import org.apache.maven.doxia.sink.render.RenderingContext; + import org.apache.maven.doxia.site.decoration.Body; + import org.apache.maven.doxia.site.decoration.DecorationModel; + import org.apache.maven.doxia.site.decoration.Skin; + import org.apache.maven.doxia.siterenderer.Renderer; + import org.apache.maven.doxia.siterenderer.RendererException; +import org.apache.maven.doxia.siterenderer.RenderingContext; - import org.apache.maven.doxia.siterenderer.SiteRenderingContext; - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - import org.apache.maven.plugin.MojoExecutionException; + import org.apache.maven.doxia.siterenderer.SiteRenderingContext; + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.plugin.MojoExecutionException; -- -1.9.3 +2.1.0 diff --git a/apache-rat-0.8-test.patch b/apache-rat-0.8-test.patch deleted file mode 100644 index 672708f..0000000 --- a/apache-rat-0.8-test.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- apache-rat-0.8-20100827/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java.test 2010-07-13 10:10:23.000000000 -0600 -+++ apache-rat-0.8-20100827/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java 2010-10-28 15:20:11.897580449 -0600 -@@ -61,7 +61,7 @@ - private Renderer newSiteRenderer() - throws Exception - { -- return (Renderer) container.lookup( Renderer.ROLE, "default" ); -+ return (Renderer) getContainer().lookup( Renderer.ROLE, "default" ); - } - - /** -@@ -129,7 +129,7 @@ - localRepo = System.getProperty( "user.home" ) + "/.m2/repository"; - } - ArtifactRepositoryLayout repositoryLayout = -- (ArtifactRepositoryLayout) container.lookup(ArtifactRepositoryLayout.ROLE, "default" ); -+ (ArtifactRepositoryLayout) getContainer().lookup(ArtifactRepositoryLayout.ROLE, "default" ); - return new DefaultArtifactRepository( "local", "file://" + localRepo, repositoryLayout ); - } - diff --git a/apache-rat.spec b/apache-rat.spec index 51ebbe3..512a1b9 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,13 +1,12 @@ Name: apache-rat -Version: 0.10 -Release: 6%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries License: ASL 2.0 URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 -Patch2: apache-rat-0.8-test.patch Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch @@ -87,7 +86,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -%patch2 -p1 -b .test %patch3 -p1 # apache-rat is a module bundling other RAT modules together and as @@ -98,6 +96,9 @@ This package contains the API documentation for %{name}. # skipped anyways. See rhbz#988561 %pom_remove_plugin :maven-antrun-plugin apache-rat-tasks +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + # wagon-ssh is not needed in Fedora. %pom_xpath_remove pom:extensions @@ -135,6 +136,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Feb 18 2015 Mikolaj Izdebski - 0.11-1 +- Update to upstream version 0.11 + * Mon Aug 11 2014 Mikolaj Izdebski - 0.10-6 - Update to Maven Doxia 1.6 diff --git a/sources b/sources index b579645..e75e527 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58f17a69466053fcca3e8b80838a3c64 apache-rat-0.10-src.tar.bz2 +47961a1ae5f5697cf40e951edff60302 apache-rat-0.11-src.tar.bz2 From b745565ebe2a3092b785e73bebfbbb5ae0135b3a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 00:06:43 +0000 Subject: [PATCH 23/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 512a1b9..7dcc6d6 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -136,6 +136,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Feb 18 2015 Mikolaj Izdebski - 0.11-1 - Update to upstream version 0.11 From 8dc48d6c0f8eba2795d0c2a1cc16c462f7796242 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:20:22 +0000 Subject: [PATCH 24/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 7dcc6d6..e197312 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -136,6 +136,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 1b75b96aa3b5f8b8514ff75009aa077f34560c9f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 23 Jun 2016 12:28:45 +0200 Subject: [PATCH 25/45] Update to upstream version 0.12 - Enable tests --- .gitignore | 1 + 0001-Port-to-current-doxia-sitetools.patch | 26 +++++++++++ 0001-Update-to-Maven-Doxia-1.6.patch | 30 ------------- apache-rat.spec | 50 +++++++++++++++------- sources | 2 +- 5 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 0001-Port-to-current-doxia-sitetools.patch delete mode 100644 0001-Update-to-Maven-Doxia-1.6.patch diff --git a/.gitignore b/.gitignore index d71dda4..3b9a7b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /apache-rat-0.9-src.tar.bz2 /apache-rat-0.10-src.tar.bz2 /apache-rat-0.11-src.tar.bz2 +/apache-rat-0.12-src.tar.bz2 diff --git a/0001-Port-to-current-doxia-sitetools.patch b/0001-Port-to-current-doxia-sitetools.patch new file mode 100644 index 0000000..d90c0f9 --- /dev/null +++ b/0001-Port-to-current-doxia-sitetools.patch @@ -0,0 +1,26 @@ +From a49b2c89cdd8478ac83b8227c10a5da3155e3581 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 23 Jun 2016 12:22:32 +0200 +Subject: [PATCH 1/2] Port to current doxia-sitetools + +--- + apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +index 8d1eae6..01aceb3 100644 +--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java ++++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +@@ -150,8 +150,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { + + siteRenderer.generateDocument(writer, sink, siteContext); + +- siteRenderer.copyResources(siteContext, new File(getProject().getBasedir(), "src/site/resources"), +- outputDirectory); ++ siteRenderer.copyResources(siteContext, outputDirectory); + } catch (IOException e) { + throw new MojoExecutionException(e.getMessage(), e); + } catch (MavenReportException e) { +-- +2.7.4 + diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch deleted file mode 100644 index c55f2fd..0000000 --- a/0001-Update-to-Maven-Doxia-1.6.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0afc2d821039be592828553aa031f8280e701b27 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 11 Aug 2014 14:26:34 +0200 -Subject: [PATCH] Update to Maven Doxia 1.6 - ---- - apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -index a9e5aa9..6ea74c1 100644 ---- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -@@ -39,12 +39,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import org.apache.maven.artifact.resolver.ArtifactResolver; - import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; - import org.apache.maven.artifact.versioning.VersionRange; --import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.Body; - import org.apache.maven.doxia.site.decoration.DecorationModel; - import org.apache.maven.doxia.site.decoration.Skin; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; -+import org.apache.maven.doxia.siterenderer.RenderingContext; - import org.apache.maven.doxia.siterenderer.SiteRenderingContext; - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - import org.apache.maven.plugin.MojoExecutionException; --- -2.1.0 - diff --git a/apache-rat.spec b/apache-rat.spec index e197312..6cf4d3a 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,15 +1,15 @@ Name: apache-rat -Version: 0.11 -Release: 3%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) -Group: Development/Libraries License: ASL 2.0 URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 -Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch +Patch1: 0001-Port-to-current-doxia-sitetools.patch + BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-collections:commons-collections) @@ -25,20 +25,21 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-core) BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) -BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) BuildRequires: mvn(org.apache.maven:maven-artifact-manager) -BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven:maven-settings:2.2.1) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.mockito:mockito-all) +BuildRequires: mvn(org.mockito:mockito-core) %description Release Audit Tool (RAT) is a tool to improve accuracy and efficiency when @@ -53,6 +54,11 @@ It is therefore highly tuned to the Apache style of releases. This package just contains meta-data, you will want either apache-rat-tasks, or apache-rat-plugin. +%package api +Summary: API module for %{name} + +%description api +Shared beans and services. %package core Summary: Core functionality for %{name} @@ -86,7 +92,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -%patch3 -p1 + +%patch1 -p1 # apache-rat is a module bundling other RAT modules together and as # such it is not needed. @@ -99,18 +106,23 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin +# runs non-xmvn maven and downloads stuff +%pom_remove_plugin -r :maven-invoker-plugin + # wagon-ssh is not needed in Fedora. %pom_xpath_remove pom:extensions +# incompatible with our plexus-container +rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java + %build -# Tests are skipped because of incompatibility with Maven 3 -%mvn_build -s -f +%mvn_build -s %install %mvn_install #Wrapper script -%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true +%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true #Ant taksks mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d @@ -120,22 +132,28 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %files -f .mfiles-%{name}-project %doc LICENSE NOTICE -%files core -f .mfiles-%{name}-core -%doc README.txt RELEASE_NOTES.txt +%files api -f .mfiles-%{name}-api +%doc README.txt RELEASE-NOTES.txt %doc LICENSE NOTICE -%dir %{_javadir}/%{name} + +%files core -f .mfiles-%{name}-core %{_bindir}/%{name} %files plugin -f .mfiles-%{name}-plugin %files tasks -f .mfiles-%{name}-tasks %{_sysconfdir}/ant.d/%{name} +%doc ant-task-examples.xml %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Thu Jun 23 2016 Michael Simacek - 0.12-1 +- Update to upstream version 0.12 +- Enable tests + * Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e75e527..920dc7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47961a1ae5f5697cf40e951edff60302 apache-rat-0.11-src.tar.bz2 +b16ae9ada406b55cd8ea8374d55d68bf apache-rat-0.12-src.tar.bz2 From ee32c0ee2e601c2fe738cf3a0fdd6708e766b7d4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 23 Jun 2016 13:39:18 +0200 Subject: [PATCH 26/45] Remove antrun-plugin from parent pom --- apache-rat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 6cf4d3a..69e1b78 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -101,7 +101,7 @@ This package contains the API documentation for %{name}. # maven-antrun-plugin is used for running tests only and tests are # skipped anyways. See rhbz#988561 -%pom_remove_plugin :maven-antrun-plugin apache-rat-tasks +%pom_remove_plugin -r :maven-antrun-plugin %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 85201d29660c6e1212af7fdc55ac620a7b4ed620 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 10 Nov 2016 08:03:42 +0100 Subject: [PATCH 27/45] Port to current doxia sitetools --- 0001-Port-to-current-doxia-sitetools.patch | 38 +++++++++++++--------- apache-rat.spec | 5 ++- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/0001-Port-to-current-doxia-sitetools.patch b/0001-Port-to-current-doxia-sitetools.patch index d90c0f9..569e3b9 100644 --- a/0001-Port-to-current-doxia-sitetools.patch +++ b/0001-Port-to-current-doxia-sitetools.patch @@ -1,26 +1,34 @@ -From a49b2c89cdd8478ac83b8227c10a5da3155e3581 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Thu, 23 Jun 2016 12:22:32 +0200 -Subject: [PATCH 1/2] Port to current doxia-sitetools +From 8f572ac8d4f7f128e224cde92f8c604631ca8548 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 10 Nov 2016 07:59:31 +0100 +Subject: [PATCH] Port to current doxia sitetools --- - apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -index 8d1eae6..01aceb3 100644 +index 8d1eae6..ea25a00 100644 --- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -@@ -150,8 +150,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { +@@ -89,7 +89,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { + * @throws MojoFailureException An error in the plugin configuration was detected. + * @throws MojoExecutionException An error occurred while searching for the artifact file. + */ +- private File getSkinArtifactFile() throws MojoFailureException, MojoExecutionException { ++ private Artifact getSkinArtifactFile() throws MojoFailureException, MojoExecutionException { + final Skin skin = Skin.getDefaultSkin(); - siteRenderer.generateDocument(writer, sink, siteContext); + String version = skin.getVersion(); +@@ -112,7 +112,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { + throw new MojoFailureException("The skin does not exist: " + e.getMessage()); + } -- siteRenderer.copyResources(siteContext, new File(getProject().getBasedir(), "src/site/resources"), -- outputDirectory); -+ siteRenderer.copyResources(siteContext, outputDirectory); - } catch (IOException e) { - throw new MojoExecutionException(e.getMessage(), e); - } catch (MavenReportException e) { +- return artifact.getFile(); ++ return artifact; + } + + /** -- 2.7.4 diff --git a/apache-rat.spec b/apache-rat.spec index 69e1b78..56aeacb 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Thu Nov 10 2016 Mikolaj Izdebski - 0.12-2 +- Port to current doxia sitetools + * Thu Jun 23 2016 Michael Simacek - 0.12-1 - Update to upstream version 0.12 - Enable tests From c2eaf846f6162140718bb9b378f03aee60ddf4b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:06:44 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 56aeacb..71f3f3d 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Nov 10 2016 Mikolaj Izdebski - 0.12-2 - Port to current doxia sitetools From 9d2f676d733505de12b870c5dbac920bbd54639a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:03:21 +0000 Subject: [PATCH 29/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 71f3f3d..2db8b1b 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 36e1bccc2d21c790bd474b2af5d8c3254edb796f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:33:42 +0000 Subject: [PATCH 30/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 2db8b1b..2651c5c 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d18394113d140b26e058ab6c35c9c26202b891d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:22:19 +0000 Subject: [PATCH 31/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 2651c5c..d8afdb1 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 01b15cb7c76c21dfb13e53ec64bf86ff890f49d6 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Thu, 30 Aug 2018 17:23:21 +0200 Subject: [PATCH 32/45] Add explicit javapackages-tools requirement --- apache-rat.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index d8afdb1..8a74b5e 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -62,6 +62,9 @@ Shared beans and services. %package core Summary: Core functionality for %{name} +# Explicit requires for javapackages-tools since apache-rat-script +# uses /usr/share/java-utils/java-functions +Requires: javapackages-tools %description core The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. @@ -150,6 +153,10 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Thu Aug 30 2018 Severin Gehwolf - 0.12-7 +- Add explicit requirement for javapackages-tools. + See RHBZ#1600426. + * Thu Jul 12 2018 Fedora Release Engineering - 0.12-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0097c1e49c9ebb35e48343db4f61ae940cf4fa97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:32:36 +0000 Subject: [PATCH 33/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 8a74b5e..fe735d1 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -153,6 +153,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Aug 30 2018 Severin Gehwolf - 0.12-7 - Add explicit requirement for javapackages-tools. See RHBZ#1600426. From f12adf4349a0c16437e9f5b4cc737916fc75ee2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:09:59 +0000 Subject: [PATCH 34/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index fe735d1..21a7df6 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Apache Release Audit Tool (RAT) License: ASL 2.0 @@ -153,6 +153,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e0b97f28ff1f5a866a77f643675e4aa351b22784 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 29 Jul 2019 23:39:14 +0200 Subject: [PATCH 35/45] update to version 0.13 --- .gitignore | 4 ++++ apache-rat.spec | 50 +++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3b9a7b2..f6537e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ +/results_* +/*.src.rpm + /apache-rat-0.8-20100827.tar.bz2 /apache-rat-incubating-0.8-src.tar.bz2 /apache-rat-0.9-src.tar.bz2 /apache-rat-0.10-src.tar.bz2 /apache-rat-0.11-src.tar.bz2 /apache-rat-0.12-src.tar.bz2 +/apache-rat-0.13-src.tar.bz2 diff --git a/apache-rat.spec b/apache-rat.spec index 21a7df6..9c16f2f 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,15 +1,16 @@ Name: apache-rat -Version: 0.12 -Release: 9%{?dist} Summary: Apache Release Audit Tool (RAT) - +Version: 0.13 +Release: 1%{?dist} License: ASL 2.0 + URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 -BuildArch: noarch Patch1: 0001-Port-to-current-doxia-sitetools.patch +BuildArch: noarch + BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-collections:commons-collections) @@ -54,47 +55,50 @@ It is therefore highly tuned to the Apache style of releases. This package just contains meta-data, you will want either apache-rat-tasks, or apache-rat-plugin. -%package api + +%package api Summary: API module for %{name} -%description api +%description api Shared beans and services. -%package core + +%package core Summary: Core functionality for %{name} -# Explicit requires for javapackages-tools since apache-rat-script + +# explicit requires for javapackages-tools since apache-rat-script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools -%description core +%description core The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. It also includes a wrapper script "apache-rat" that should be the equivalent to running upstream's "java -jar apache-rat.jar". -%package plugin +%package plugin Summary: Maven plugin for %{name} -%description plugin +%description plugin Maven plugin for running RAT, the Release Audit Tool. -%package tasks +%package tasks Summary: Ant tasks for %{name} -%description tasks +%description tasks Ant tasks for running RAT. -%package javadoc +%package javadoc Summary: Javadocs for %{name} -%description javadoc +%description javadoc This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p1 @@ -106,6 +110,10 @@ This package contains the API documentation for %{name}. # skipped anyways. See rhbz#988561 %pom_remove_plugin -r :maven-antrun-plugin +# don't run apache-rat's checks on apache-rat: +# these tests fail and would introduce a circular self-dependency +%pom_remove_plugin -r :apache-rat-plugin + %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -118,16 +126,18 @@ This package contains the API documentation for %{name}. # incompatible with our plexus-container rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java + %build %mvn_build -s + %install %mvn_install -#Wrapper script +# create wrapper script %jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true -#Ant taksks +# install ant taksks mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} @@ -153,6 +163,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Mon Jul 29 2019 Fabio Valentini - 0.13-1 +- Update to version 0.13. + * Wed Jul 24 2019 Fedora Release Engineering - 0.12-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -277,3 +290,4 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ * Wed Aug 11 2010 Orion Poplawski 0.8-0.1 - Initial Fedora package + diff --git a/sources b/sources index 920dc7f..b7045d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b16ae9ada406b55cd8ea8374d55d68bf apache-rat-0.12-src.tar.bz2 +SHA512 (apache-rat-0.13-src.tar.bz2) = 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a From 196cce2a91188cd4afa6aafb5097b37ee46e372a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:48:08 +0000 Subject: [PATCH 36/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 9c16f2f..3fad041 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -163,6 +163,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jul 29 2019 Fabio Valentini - 0.13-1 - Update to version 0.13. From 415ff7db9ecc9631b03c16213d6b574848ab993d Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 16:01:58 +0200 Subject: [PATCH 37/45] Rebuilt for JDK-11 --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 3fad041..348ba78 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -163,6 +163,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Fri Jul 10 2020 Jiri Vanek - 0.13-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 13e0b09f74c400fb76d4d208d5103b3dae12c331 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 18 Jul 2020 11:31:34 +0200 Subject: [PATCH 38/45] set javac source and target to 1.8 to fix Java 11 builds --- apache-rat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 348ba78..c2baad3 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -128,7 +128,7 @@ rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install @@ -163,6 +163,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Sat Jul 18 2020 Fabio Valentini - 0.13-4 +- Set javac source and target to 1.8 to fix Java 11 builds. + * Fri Jul 10 2020 Jiri Vanek - 0.13-3 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 989232114d24216161f10acce1456e8032f455a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:12:56 +0000 Subject: [PATCH 39/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index c2baad3..6a16608 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -163,6 +163,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 18 2020 Fabio Valentini - 0.13-4 - Set javac source and target to 1.8 to fix Java 11 builds. From 659c2d47746b56fdfca2a9f3721ad82217d02d70 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 28 Jul 2020 16:13:02 +0200 Subject: [PATCH 40/45] port to commons-lang3 --- apache-rat.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 6a16608..24d9708 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -22,6 +22,7 @@ BuildRequires: mvn(org.apache.ant:ant-antunit) BuildRequires: mvn(org.apache.ant:ant-testutil) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.doxia:doxia-core) BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) @@ -123,6 +124,16 @@ This package contains the API documentation for %{name}. # wagon-ssh is not needed in Fedora. %pom_xpath_remove pom:extensions +# trivial port to commons-lang3 +%pom_change_dep -r :commons-lang org.apache.commons:commons-lang3:3.8.1 + +sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ + apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java +sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ + apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java +sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ + apache-rat-core/src/main/java/org/apache/rat/Report.java + # incompatible with our plexus-container rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java @@ -163,6 +174,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Tue Jul 28 2020 Fabio Valentini - 0.13-6 +- Port to commons-lang3. + * Mon Jul 27 2020 Fedora Release Engineering - 0.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dadb78f600633938acd541a850873c3901846aa7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 30 Jul 2020 15:25:46 +0200 Subject: [PATCH 41/45] remove stray commons-lang:commons-lang BuildRequires --- apache-rat.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apache-rat.spec b/apache-rat.spec index 24d9708..93a458a 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -15,7 +15,6 @@ BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.ant:ant-antunit) @@ -174,6 +173,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Thu Jul 30 2020 Fabio Valentini - 0.13-7 +- Remove stray commons-lang:commons-lang BuildRequires. + * Tue Jul 28 2020 Fabio Valentini - 0.13-6 - Port to commons-lang3. From 907046260a8d13b7332c2ae4f6792fd17b6003bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:16:20 +0000 Subject: [PATCH 42/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 93a458a..5396400 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -173,6 +173,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jul 30 2020 Fabio Valentini - 0.13-7 - Remove stray commons-lang:commons-lang BuildRequires. From d6bb1847eb51dc66ae73d409f82740fdaf3c911e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:48:31 +0000 Subject: [PATCH 43/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a3db7684f395aa9cb3ac5a4c7d064bff1196c751 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:44:33 +0000 Subject: [PATCH 44/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-rat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-rat.spec b/apache-rat.spec index 5396400..5d6e6a2 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,7 +1,7 @@ Name: apache-rat Summary: Apache Release Audit Tool (RAT) Version: 0.13 -Release: 8%{?dist} +Release: 9%{?dist} License: ASL 2.0 URL: http://creadur.apache.org/rat/ @@ -173,6 +173,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From be5a771401f9901f84d263e985eac9fc398cc285 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 3 Jan 2022 05:53:15 +0700 Subject: [PATCH 45/45] Unmaintained upstream --- .gitignore | 10 - 0001-Port-to-current-doxia-sitetools.patch | 34 --- apache-rat.spec | 327 --------------------- dead.package | 1 + sources | 1 - 5 files changed, 1 insertion(+), 372 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Port-to-current-doxia-sitetools.patch delete mode 100644 apache-rat.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f6537e0..0000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/results_* -/*.src.rpm - -/apache-rat-0.8-20100827.tar.bz2 -/apache-rat-incubating-0.8-src.tar.bz2 -/apache-rat-0.9-src.tar.bz2 -/apache-rat-0.10-src.tar.bz2 -/apache-rat-0.11-src.tar.bz2 -/apache-rat-0.12-src.tar.bz2 -/apache-rat-0.13-src.tar.bz2 diff --git a/0001-Port-to-current-doxia-sitetools.patch b/0001-Port-to-current-doxia-sitetools.patch deleted file mode 100644 index 569e3b9..0000000 --- a/0001-Port-to-current-doxia-sitetools.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f572ac8d4f7f128e224cde92f8c604631ca8548 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 10 Nov 2016 07:59:31 +0100 -Subject: [PATCH] Port to current doxia sitetools - ---- - apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -index 8d1eae6..ea25a00 100644 ---- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -@@ -89,7 +89,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { - * @throws MojoFailureException An error in the plugin configuration was detected. - * @throws MojoExecutionException An error occurred while searching for the artifact file. - */ -- private File getSkinArtifactFile() throws MojoFailureException, MojoExecutionException { -+ private Artifact getSkinArtifactFile() throws MojoFailureException, MojoExecutionException { - final Skin skin = Skin.getDefaultSkin(); - - String version = skin.getVersion(); -@@ -112,7 +112,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { - throw new MojoFailureException("The skin does not exist: " + e.getMessage()); - } - -- return artifact.getFile(); -+ return artifact; - } - - /** --- -2.7.4 - diff --git a/apache-rat.spec b/apache-rat.spec deleted file mode 100644 index 5d6e6a2..0000000 --- a/apache-rat.spec +++ /dev/null @@ -1,327 +0,0 @@ -Name: apache-rat -Summary: Apache Release Audit Tool (RAT) -Version: 0.13 -Release: 9%{?dist} -License: ASL 2.0 - -URL: http://creadur.apache.org/rat/ -Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 - -Patch1: 0001-Port-to-current-doxia-sitetools.patch - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: mvn(commons-cli:commons-cli) -BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.ant:ant-antunit) -BuildRequires: mvn(org.apache.ant:ant-testutil) -BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.apache.commons:commons-compress) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.doxia:doxia-core) -BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) -BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) -BuildRequires: mvn(org.apache.maven:maven-artifact-manager) -BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings:2.2.1) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.hamcrest:hamcrest-library) -BuildRequires: mvn(org.mockito:mockito-all) -BuildRequires: mvn(org.mockito:mockito-core) - -%description -Release Audit Tool (RAT) is a tool to improve accuracy and efficiency when -checking releases. It is heuristic in nature: making guesses about possible -problems. It will produce false positives and cannot find every possible -issue with a release. It's reports require interpretation. - -RAT was developed in response to a need felt in the Apache Incubator to be -able to review releases for the most common faults less labor intensively. -It is therefore highly tuned to the Apache style of releases. - -This package just contains meta-data, you will want either apache-rat-tasks, -or apache-rat-plugin. - - -%package api -Summary: API module for %{name} - -%description api -Shared beans and services. - - -%package core -Summary: Core functionality for %{name} - -# explicit requires for javapackages-tools since apache-rat-script -# uses /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description core -The core functionality of RAT, shared by the Ant tasks, and the Maven plugin. -It also includes a wrapper script "apache-rat" that should be the equivalent -to running upstream's "java -jar apache-rat.jar". - - -%package plugin -Summary: Maven plugin for %{name} - -%description plugin -Maven plugin for running RAT, the Release Audit Tool. - - -%package tasks -Summary: Ant tasks for %{name} - -%description tasks -Ant tasks for running RAT. - - -%package javadoc -Summary: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - - -%prep -%setup -q - -%patch1 -p1 - -# apache-rat is a module bundling other RAT modules together and as -# such it is not needed. -%pom_disable_module apache-rat - -# maven-antrun-plugin is used for running tests only and tests are -# skipped anyways. See rhbz#988561 -%pom_remove_plugin -r :maven-antrun-plugin - -# don't run apache-rat's checks on apache-rat: -# these tests fail and would introduce a circular self-dependency -%pom_remove_plugin -r :apache-rat-plugin - -%pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin - -# runs non-xmvn maven and downloads stuff -%pom_remove_plugin -r :maven-invoker-plugin - -# wagon-ssh is not needed in Fedora. -%pom_xpath_remove pom:extensions - -# trivial port to commons-lang3 -%pom_change_dep -r :commons-lang org.apache.commons:commons-lang3:3.8.1 - -sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ - apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java -sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ - apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java -sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ - apache-rat-core/src/main/java/org/apache/rat/Report.java - -# incompatible with our plexus-container -rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java - - -%build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 - - -%install -%mvn_install - -# create wrapper script -%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true - -# install ant taksks -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d -echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} - - -%files -f .mfiles-%{name}-project -%doc LICENSE NOTICE - -%files api -f .mfiles-%{name}-api -%doc README.txt RELEASE-NOTES.txt -%doc LICENSE NOTICE - -%files core -f .mfiles-%{name}-core -%{_bindir}/%{name} - -%files plugin -f .mfiles-%{name}-plugin - -%files tasks -f .mfiles-%{name}-tasks -%{_sysconfdir}/ant.d/%{name} -%doc ant-task-examples.xml - -%files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE - - -%changelog -* Wed Jul 21 2021 Fedora Release Engineering - 0.13-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jul 30 2020 Fabio Valentini - 0.13-7 -- Remove stray commons-lang:commons-lang BuildRequires. - -* Tue Jul 28 2020 Fabio Valentini - 0.13-6 -- Port to commons-lang3. - -* Mon Jul 27 2020 Fedora Release Engineering - 0.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 18 2020 Fabio Valentini - 0.13-4 -- Set javac source and target to 1.8 to fix Java 11 builds. - -* Fri Jul 10 2020 Jiri Vanek - 0.13-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jul 29 2019 Fabio Valentini - 0.13-1 -- Update to version 0.13. - -* Wed Jul 24 2019 Fedora Release Engineering - 0.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Aug 30 2018 Severin Gehwolf - 0.12-7 -- Add explicit requirement for javapackages-tools. - See RHBZ#1600426. - -* Thu Jul 12 2018 Fedora Release Engineering - 0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Nov 10 2016 Mikolaj Izdebski - 0.12-2 -- Port to current doxia sitetools - -* Thu Jun 23 2016 Michael Simacek - 0.12-1 -- Update to upstream version 0.12 -- Enable tests - -* Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 18 2015 Mikolaj Izdebski - 0.11-1 -- Update to upstream version 0.11 - -* Mon Aug 11 2014 Mikolaj Izdebski - 0.10-6 -- Update to Maven Doxia 1.6 - -* Fri Jun 13 2014 Michal Srb - 0.10-5 -- Fix FTBFS (Resolves: #1105955) - -* Sat Jun 07 2014 Fedora Release Engineering - 0.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 14 2014 Mikolaj Izdebski - 0.10-3 -- Remove wagon-ssh extension from POM - -* Thu Oct 3 2013 Mikolaj Izdebski - 0.10-2 -- Add missing BR -- Update to current packaging guidelines - -* Tue Sep 3 2013 Orion Poplawski 0.10-1 -- Update to 0.10 - -* Fri Aug 9 2013 Orion Poplawski 0.9-1 -- Update to 0.9 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Orion Poplawski 0.8-10 -- Split up depmap fragments (bug 973242) - -* Tue Feb 26 2013 Orion Poplawski 0.8-9 -- Drop BR on maven-doxia and maven-doxia-sitetools (bug #915606) - -* Tue Feb 12 2013 Orion Poplawski 0.8-8 -- Add apache-rat wrapper script to apache-rat-core (bug #907782) -- Disable tests for now due to Fedora maven bug - -* Wed Feb 06 2013 Java SIG - 0.8-7 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Aug 16 2012 Mikolaj Izdebski - 0.8-6 -- Run mvn-rpmbuild package instead of install - -* Thu Aug 16 2012 Mikolaj Izdebski - 0.8-5 -- Install NOTICE files -- Remove defattr - -* Wed Jul 18 2012 Fedora Release Engineering - 0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 7 2011 Orion Poplawski 0.8-2 -- Update to maven 3 - -* Tue Dec 6 2011 Orion Poplawski 0.8-1 -- Update to 0.8 release -- Add BR maven-invoker-plugin - -* Thu Apr 28 2011 Orion Poplawski 0.8-0.7.20100827 -- Add needed requires to core - -* Thu Mar 3 2011 Orion Poplawski 0.8-0.6.20100827 -- Drop unneeded rm from %%install -- Don't ship BUILD.txt -- Cleanup Requires - -* Mon Dec 27 2010 Orion Poplawski 0.8-0.5.20100827 -- Drop maven settings patch -- Add svn revision to export command -- Set maven.test.failure.ignore=true instead of maven.test.skip -- Use %%{_mavenpomdir} - -* Thu Dec 9 2010 Orion Poplawski 0.8-0.4.20100827 -- Change BR to ant-antunit -- Drop versioned jar and javadoc -- Drop BuildRoot and %%clean - -* Mon Nov 1 2010 Orion Poplawski 0.8-0.3.20100827 -- Add /etc/ant.d/apache-rat - -* Fri Oct 29 2010 Orion Poplawski 0.8-0.2.20100827 -- First real working package - -* Wed Aug 11 2010 Orion Poplawski 0.8-0.1 -- Initial Fedora package - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..151f4be --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unmaintained upstream diff --git a/sources b/sources deleted file mode 100644 index b7045d1..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (apache-rat-0.13-src.tar.bz2) = 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a