[javapackages-tools] Add R: maven-surefire-provider-junit4 to maven-local
by Mikolaj Izdebski
commit 69bc26916d115d9dbd6fa29d4301160f9bf95136
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 12:32:01 2013 +0200
Add R: maven-surefire-provider-junit4 to maven-local
In older versions of maven-surefire provider-junit and provider-junit4
were separate packages; maven-local needs them both.
javapackages-tools.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index f481643..f511586 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 0.13.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
@@ -47,6 +47,7 @@ Requires: maven-surefire-plugin
# Tests based on JUnit are very common and JUnit itself is small.
# Include JUnit provider for Surefire just for convenience.
Requires: maven-surefire-provider-junit
+Requires: maven-surefire-provider-junit4
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
@@ -114,6 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.7-2
+- Add R: maven-surefire-provider-junit4 to maven-local
+
* Fri Mar 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.7-1
- Update to upstream version 0.13.7
11 years
[maven-reporting-impl] Add missing BuildRequires
by Mikolaj Izdebski
commit dee574680973ad47c4b49591c7ae960049298249
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 12:07:35 2013 +0200
Add missing BuildRequires
maven-reporting-impl.spec | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index 22bc0c0..ac1b416 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -1,6 +1,6 @@
Name: maven-reporting-impl
Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Abstract classes to manage report generation
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-reporting-impl
@@ -12,7 +12,16 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: maven-shared
+BuildRequires: mvn(commons-validator:commons-validator)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-core)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%{?fedora:BuildRequires: junit-addons}
Obsoletes: maven-shared-reporting-impl < %{version}-%{release}
@@ -49,6 +58,9 @@ cp -p %{SOURCE1} LICENSE.txt
%doc LICENSE.txt
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-6
+- Add missing BuildRequires
+
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - error: line 15: Unknown tag: 18
- Skip running tests outsides Fedora
11 years
[maven-reporting-impl] Skip running tests outsides Fedora
by Mikolaj Izdebski
commit af918bebff5502356d48370c139b5e801f386909
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 10:04:36 2013 +0200
Skip running tests outsides Fedora
maven-reporting-impl.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index 9487428..22bc0c0 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -1,6 +1,6 @@
Name: maven-reporting-impl
Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Abstract classes to manage report generation
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-reporting-impl
@@ -13,7 +13,7 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: maven-shared
-BuildRequires: junit-addons
+%{?fedora:BuildRequires: junit-addons}
Obsoletes: maven-shared-reporting-impl < %{version}-%{release}
Provides: maven-shared-reporting-impl = %{version}-%{release}
@@ -37,7 +37,7 @@ API documentation for %{name}.
cp -p %{SOURCE1} LICENSE.txt
%build
-%mvn_build
+%mvn_build %{!?fedora:-f}
%install
%mvn_install
@@ -49,6 +49,9 @@ cp -p %{SOURCE1} LICENSE.txt
%doc LICENSE.txt
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - error: line 15: Unknown tag: 18
+- Skip running tests outsides Fedora
+
* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-4
- Build with xmvn
11 years
[maven-doxia] Conditionally disable itext module
by Mikolaj Izdebski
commit b9a2c01c560ec044958bb1df15a044471b8c6af9
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 11:00:56 2013 +0200
Conditionally disable itext module
maven-doxia.spec | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 6396f42..ccd7a75 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -28,9 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%if 0%{?fedora}
+%bcond_without itext
+%endif
+
Name: maven-doxia
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -51,14 +55,12 @@ Patch1: 0002-doxia-core-remove-plexus-component-annotation.patch
# http://jira.codehaus.org/browse/DOXIA-53
Patch3: 0004-Fix-itext-dependency.patch
-
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: ant-nodeps
-BuildRequires: itext
BuildRequires: plexus-cli
BuildRequires: maven-local
BuildRequires: maven-assembly-plugin
@@ -99,6 +101,9 @@ BuildRequires: avalon-framework
BuildRequires: geronimo-parent-poms
BuildRequires: geronimo-jms
BuildRequires: javamail
+%if %{with itext}
+BuildRequires: itext
+%endif
Obsoletes: maven-doxia-book < %{epoch}:%{version}-%{release}
Obsoletes: maven-doxia-maven-plugin < %{epoch}:%{version}-%{release}
@@ -154,11 +159,13 @@ Summary: FO module for %{name}
%description module-fo
This package provides %{summary}.
+%if %{with itext}
%package module-itext
Summary: iText module for %{name}
%description module-itext
This package provides %{summary}.
+%endif
%package module-latex
Summary: Latex module for %{name}
@@ -231,7 +238,10 @@ API documentation for %{name}.
"<useJava5>true</useJava5>" doxia-modules/doxia-module-fml/pom.xml
# markdown module requires older version (1.0.2) of the pegdown library
-%pom_disable_module doxia-module-markdown doxia-modules/pom.xml
+%pom_disable_module doxia-module-markdown doxia-modules
+%if %{without itext}
+%pom_disable_module doxia-module-itext doxia-modules
+%endif
%build
# tests disabled because some use old plexus-container and don't work
@@ -252,7 +262,9 @@ API documentation for %{name}.
%files module-docbook-simple -f .mfiles-doxia-module-docbook-simple
%files module-fml -f .mfiles-doxia-module-fml
%files module-fo -f .mfiles-doxia-module-fo
+%if %{with itext}
%files module-itext -f .mfiles-doxia-module-itext
+%endif
%files module-latex -f .mfiles-doxia-module-latex
%files module-rtf -f .mfiles-doxia-module-rtf
%files modules -f .mfiles-doxia-modules
@@ -267,6 +279,9 @@ API documentation for %{name}.
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.3-2
+- Conditionally disable itext module
+
* Tue Mar 19 2013 Michal Srb <msrb(a)redhat.com> - 0:1.3-1
- Update to upstream version 1.3
- Remove temporary dependencies on subpackages
11 years
[maven/f17] Add missing R: tar
by Mikolaj Izdebski
commit 1e906ad62aae3799cd78f3250e98fec0076ab972
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 09:39:03 2013 +0200
Add missing R: tar
maven.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 98b175f..20559a3 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 14.2%{?dist}
+Release: 14.3%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -97,6 +97,7 @@ Requires: plexus-sec-dispatcher
Requires: plexus-utils
Requires: sisu >= 2.1.1-2
Requires: sonatype-oss-parent
+Requires: tar
Requires: xbean
Requires: xerces-j2
Requires: yum-utils
@@ -377,6 +378,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-14.3
+- Add missing R: tar
+
* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-14.2
- Remove maven-local provides
11 years
[maven/f18] Add missing R: tar
by Mikolaj Izdebski
commit 7558f6523eada35a8f9645b62c8f92b5932ce310
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 09:40:48 2013 +0200
Add missing R: tar
maven.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index b7e3b03..1bacff4 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 21.2%{?dist}
+Release: 21.3%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -101,6 +101,7 @@ Requires: plexus-sec-dispatcher
Requires: plexus-utils
Requires: sisu >= 2.1.1-2
Requires: sonatype-oss-parent
+Requires: tar
Requires: xbean
Requires: xerces-j2
Requires: yum-utils
@@ -385,6 +386,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-21.3
+- Add missing R: tar
+
* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-21.2
- Fix license tag
11 years