[ant/f19] Update to upstream version 1.9.0
by Michal Srb
commit d3da04c3f7f3056dcc81b08e372e259b661c15b3
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Mar 21 15:07:55 2013 +0100
Update to upstream version 1.9.0
ant.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index e0bf185..9b1e5d9 100644
--- a/ant.spec
+++ b/ant.spec
@@ -48,8 +48,8 @@
%global major_version 1.8
Name: ant
-Version: 1.8.4
-Release: 6%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -741,6 +741,9 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# -----------------------------------------------------------------------------
%changelog
+* Mon Mar 11 2013 Michal Srb <msrb(a)redhat.com> - 0:1.9.0-1
+- Update to upstream version 1.9.0
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.8.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
11 years, 1 month
[maven-project-info-reports-plugin/f19] Remove dependencies with test scope
by Mikolaj Izdebski
commit 5ef117917c232ea1691603855b1ad9c72e427bbf
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 14:30:13 2013 +0200
Remove dependencies with test scope
maven-project-info-reports-plugin.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-project-info-reports-plugin.spec b/maven-project-info-reports-plugin.spec
index 51e8f52..f20c93b 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-project-info-reports-plugin
Version: 2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven Project Info Reports Plugin
Group: Development/Libraries
@@ -81,6 +81,7 @@ API documentation for %{name}.
pushd %{name}-%{version}
# removed cvsjava provider since we don't support it anymore
%pom_remove_dep :maven-scm-provider-cvsjava
+%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
popd
%build
@@ -113,6 +114,9 @@ popd
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.6-5
+- Remove dependencies with test scope
+
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.6-4
- Add missing Requires on doxia packages
- Resolves: rhbz#909250
11 years, 1 month
[maven-project-info-reports-plugin] Add missing Requires on doxia packages
by Mikolaj Izdebski
commit c2168cec5cdc2ba8eb7c79ef8576f19cc1ae7c7f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 14:10:24 2013 +0200
Add missing Requires on doxia packages
- Resolves: rhbz#909250
maven-project-info-reports-plugin.spec | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/maven-project-info-reports-plugin.spec b/maven-project-info-reports-plugin.spec
index ccffcf5..51e8f52 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-project-info-reports-plugin
Version: 2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Project Info Reports Plugin
Group: Development/Libraries
@@ -26,6 +26,7 @@ BuildRequires: maven-doxia-sink-api
BuildRequires: maven-doxia-logging-api
BuildRequires: maven-doxia-core
BuildRequires: maven-doxia-module-xhtml
+BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-component-api
BuildRequires: plexus-i18n
@@ -49,6 +50,11 @@ Requires: apache-commons-validator
Requires: httpunit
Requires: servlet3
Requires: maven-dependency-tree
+Requires: maven-doxia-sink-api
+Requires: maven-doxia-logging-api
+Requires: maven-doxia-core
+Requires: maven-doxia-module-xhtml
+Requires: maven-doxia-sitetools
Requires: maven-shared-jar
Requires: maven-scm
Requires: joda-time
@@ -107,6 +113,10 @@ popd
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.6-4
+- Add missing Requires on doxia packages
+- Resolves: rhbz#909250
+
* Fri Feb 08 2013 Michal Srb <msrb(a)redhat.com> - 2.6-3
- Migrate from maven-doxia to doxia subpackages (Resolves: #909250)
- Add BR on maven-local
11 years, 1 month
[mockito] Patched LocalizedMatcher due to hamcrest update, (bug upstream)
by tradej@fedoraproject.org
commit 3261caf4f030a9fb78306551bfabae32fa2236e1
Author: Tomas Radej <tradej(a)redhat.com>
Date: Fri Apr 5 16:28:28 2013 +0200
Patched LocalizedMatcher due to hamcrest update, (bug upstream)
mockito-matcher.patch | 24 ++++++++++++++++++++++++
mockito.spec | 7 ++++++-
2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/mockito-matcher.patch b/mockito-matcher.patch
new file mode 100644
index 0000000..71572d7
--- /dev/null
+++ b/mockito-matcher.patch
@@ -0,0 +1,24 @@
+diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java
+index 01e83b3..7d249f5 100644
+--- a/src/org/mockito/internal/matchers/LocalizedMatcher.java
++++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java
+@@ -16,6 +16,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation,
+ private final Matcher actualMatcher;
+ private Location location;
+
++ /* This is a hack for Fedora. Bug has been filed here:
++ * https://code.google.com/p/mockito/issues/detail?id=428 */
++ public void describeMismatch(Object item, Description mismatchDescription) {
++ mismatchDescription.appendText("was ").appendValue(item);
++ }
++
+ public LocalizedMatcher(Matcher actualMatcher) {
+ this.actualMatcher = actualMatcher;
+ this.location = new Location();
+@@ -65,4 +71,4 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation,
+ public Matcher getActualMatcher() {
+ return actualMatcher;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/mockito.spec b/mockito.spec
index 2bd4b30..6883fdd 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
Name: mockito
Version: 1.9.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A Java mocking framework
License: MIT
@@ -11,6 +11,7 @@ Patch0: fixup-ant-script.patch
Patch1: fix-cglib-refs.patch
Patch2: maven-cglib-dependency.patch
Patch3: fix-bnd-config.patch
+Patch4: %{name}-matcher.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -51,6 +52,7 @@ This package contains the API documentation for %{name}.
# Set Bundle-Version properly
sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd
%patch3
+%patch4 -p1
%build
ant jar javadoc
@@ -86,6 +88,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE
%changelog
+* Mon Mar 25 2013 Tomas Radej <tradej(a)redhat.com> - 1.9.0-12
+- Patched LocalizedMatcher due to hamcrest update, (bug upstream)
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.9.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
11 years, 1 month
[maven-shared-utils/f19] Disable tests (they don't work with junit >= 4.11)
by Michal Srb
commit 163333a974b7308e77d44d2d5072512e9774e7c9
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Apr 8 12:59:38 2013 +0200
Disable tests (they don't work with junit >= 4.11)
maven-shared-utils.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec
index b252178..a33bea3 100644
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@@ -1,6 +1,6 @@
Name: maven-shared-utils
Version: 0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven shared utility classes
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-shared-utils
@@ -32,7 +32,8 @@ API documentation for %{name}.
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%build
-%mvn_build
+# tests don't work with junit >= 4.11
+%mvn_build -f
%install
%mvn_install
@@ -44,6 +45,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Mon Apr 08 2013 Michal Srb <msrb(a)redhat.com> - 0.3-2
+- Disable tests (they don't work with junit >= 4.11)
+
* Fri Mar 15 2013 Michal Srb <msrb(a)redhat.com> - 0.3-1
- Update to upstream version 0.3
11 years, 1 month
[maven-reporting-impl/f19] Fix bogus version in changelog
by Mikolaj Izdebski
commit 040cc2b4429ac080e645550fcb54f84e56e9ef63
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 8 12:36:09 2013 +0200
Fix bogus version in changelog
maven-reporting-impl.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index ac1b416..c5f9b25 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -61,7 +61,7 @@ cp -p %{SOURCE1} LICENSE.txt
* 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
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-5
- Skip running tests outsides Fedora
* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-4
11 years, 1 month