[apache-commons-vfs] Fix build-requires on apache-commons-parent
by Mikolaj Izdebski
commit 327ddd042a167081ecaddfd0088337d6a0117f2c
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 16:41:26 2014 +0200
Fix build-requires on apache-commons-parent
apache-commons-vfs.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index fa98bd6..6dffe98 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}
Name: apache-commons-vfs
Version: 2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Commons Virtual File System
License: ASL 2.0
Url: http://commons.apache.org/%{base_name}/
@@ -16,7 +16,7 @@ BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(commons-net:commons-net)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.commons:commons-compress)
-BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.jdom:jdom)
@@ -168,6 +168,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
%config %{_sysconfdir}/ant.d/%{short_name}
%changelog
+* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.0-14
+- Fix build-requires on apache-commons-parent
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 10 months
[apache-commons-lang3] Fix build-requires on apache-commons-parent
by Mikolaj Izdebski
commit 5f9a472028e714d4bfdc990f3952eba6206e087d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 16:39:26 2014 +0200
Fix build-requires on apache-commons-parent
apache-commons-lang3.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 207f3ac..70d0ad5 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 3.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Provides a host of helper utilities for the java.lang API
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}
@@ -15,7 +15,7 @@ Patch0: fix-ppc64le-test-failure.patch
BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
-BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
%if 0%{?rhel} <= 0
BuildRequires: mvn(org.easymock:easymock)
@@ -62,6 +62,9 @@ Summary: API documentation for %{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.3.2-3
+- Fix build-requires on apache-commons-parent
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 10 months
[apache-commons-compress] Fix build-requires on apache-commons-parent
by Mikolaj Izdebski
commit f90dc3816b95f8e0dffb9f0b9f8cfb478c285909
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 16:38:43 2014 +0200
Fix build-requires on apache-commons-parent
apache-commons-compress.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 31524e7..ba026f4 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java API for working with compressed files and archivers
Group: Development/Libraries
License: ASL 2.0
@@ -13,7 +13,7 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.tukaani:xz)
@@ -54,6 +54,9 @@ This package provides %{summary}.
%changelog
+* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.8.1-3
+- Fix build-requires on apache-commons-parent
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 10 months
[apache-commons-beanutils] Fix build-requires on apache-commons-parent
by Mikolaj Izdebski
commit 4f4238b740ddff32746b9248272cbcd8c61005c1
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 16:35:58 2014 +0200
Fix build-requires on apache-commons-parent
apache-commons-beanutils.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index fbc6b1e..4465134 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}
@@ -14,7 +14,7 @@ BuildRequires: maven-local
BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(commons-collections:commons-collections-testframework)
BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
%description
The scope of this package is to create a package of Java utility methods
@@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9.2-2
+- Fix build-requires on apache-commons-parent
+
* Fri Jun 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9.2-1
- Update to upstream version 1.9.2
- Remove legacy Provides/Obsoletes for jakarta-commons-beanutils
9 years, 10 months
[hamcrest] Fix FTBFS
by Mat Booth
Summary of changes:
dc33929... Fix FTBFS (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 10 months
[hamcrest/f21] Fix FTBFS
by Mat Booth
commit dc3392992ea1506b7c757fd158ef84f1c5c6d533
Author: Eclipse Webtools Package <eclipse-webtools(a)fedoraproject.org>
Date: Wed Jul 30 14:26:00 2014 +0100
Fix FTBFS
- Always build integration jar (removes some complexity from the spec)
- Drop unused patch
.gitignore | 8 +++++-
hamcrest-1.3-no-integration.patch | 33 -----------------------------
hamcrest.spec | 41 ++++++------------------------------
3 files changed, 13 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb4e160..3c27dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-hamcrest-1.1.tgz
/hamcrest-all-1.3.pom
/hamcrest-core-1.3.pom
/hamcrest-generator-1.3.pom
@@ -6,4 +5,9 @@ hamcrest-1.1.tgz
/hamcrest-library-1.3.pom
/hamcrest-parent-1.3.pom
/hamcrest-text-1.3.pom
-/hamcrest-1.3.tgz
+/hamcrest-*.tgz
+/hamcrest-*/
+/.project
+/*.src.rpm
+/noarch
+/.build-*.log
diff --git a/hamcrest.spec b/hamcrest.spec
index 771e567..e2cd5b8 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -33,9 +33,6 @@
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-# This option controls integration which requires easymock2 and jmock
-%bcond_without integration
-
# This option controls jarjar on qdox
# Since bundling the qdox classes prevents upgrades, we disable it by default
%bcond_with jarjar
@@ -43,14 +40,9 @@
# This option controls tests which requires ant-junit and testng
%bcond_with tests
-# If integration is disabled, then tests are disabled
-%if %without integration
-%bcond_with tests
-%endif
-
Name: hamcrest
Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -75,24 +67,18 @@ Source12: hamcrest-generator-MANIFEST.MF
Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-%{version}-no-jarjar.patch
-Patch2: %{name}-%{version}-no-integration.patch
Patch3: %{name}-%{version}-javadoc.patch
Requires: java-headless >= 1:1.6.0
Requires: qdox
-%if %with integration
Requires: easymock3
-#Requires: jmock
-%endif
BuildRequires: jpackage-utils >= 0:1.7.4
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit
BuildRequires: zip
-%if %with integration
BuildRequires: easymock3
-%endif
%if %with jarjar
BuildRequires: jarjar
%endif
@@ -143,12 +129,9 @@ ln -sf $(build-classpath jarjar) lib/generator/
# BUILD/hamcrest-1.1/lib/generator/qdox-1.6.1.jar.no
ln -sf $(build-classpath qdox) lib/generator/
# BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no
-%if %with integration
-# easymock2 is now compat package
ln -sf $(build-classpath easymock3) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
ln -sf $(build-classpath jmock) lib/integration/
-%endif
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
@@ -157,9 +140,6 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
%if %without jarjar
%patch1 -p1
%endif
-%if %without integration
-%patch2 -p1
-%endif
%patch3 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
@@ -224,11 +204,9 @@ install -m 644 build/%{name}-library-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-library.pom
%add_maven_depmap JPP.%{name}-library.pom %{name}/library.jar
-%if %with integration
install -m 644 build/%{name}-integration-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration.jar
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-integration.pom
%add_maven_depmap JPP.%{name}-integration.pom %{name}/integration.jar
-%endif
install -m 644 build/%{name}-text-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/text.jar
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-text.pom
@@ -246,22 +224,12 @@ cp -pr build/temp/hamcrest-all-1.3-javadoc.jar.contents/* $RPM_BUILD_ROOT%{_java
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
-%files
+%files -f .mfiles
%doc LICENSE.txt
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/all.jar
-%{_javadir}/%{name}/core.jar
-%{_javadir}/%{name}/generator.jar
-%if %with integration
-%{_javadir}/%{name}/integration.jar
-%endif
-%{_javadir}/%{name}/library.jar
-%{_javadir}/%{name}/text.jar
%if %with tests
%{_javadir}/%{name}/unit-test.jar
%endif
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
%files javadoc
%{_javadocdir}/%{name}
@@ -270,6 +238,11 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Wed Jul 30 2014 Mat Booth <mat.booth(a)redhat.com> - 0:1.3-8
+- Fix FTBFS
+- Always build integration jar (removes some complexity from the spec)
+- Drop unused patch
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 10 months
[apache-commons-codec/f21] Fix incorrect parent BR causing FTBFS
by Mat Booth
commit d4508b766b5fb8afe670b9044cb4f416d4ab4bb5
Author: Eclipse Webtools Package <eclipse-webtools(a)fedoraproject.org>
Date: Wed Jul 30 13:52:30 2014 +0100
Fix incorrect parent BR causing FTBFS
.gitignore | 2 ++
apache-commons-codec.spec | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 838fd20..c5fb0d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/commons-codec-1.7-src.tar.gz
/commons-codec-1.8-src.tar.gz
/commons-codec-1.9-src.tar.gz
+/*.src.rpm
+/noarch
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 3ab44ce..1d5f517 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Implementations of common encoders and decoders
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
@@ -15,7 +15,7 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{shor
Source1: aspell-mail.txt
BuildRequires: maven-local
-BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
# It looks like there are packages in F-18 that BR/R the short name
@@ -61,6 +61,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%doc LICENSE.txt NOTICE.txt aspell-mail.txt
%changelog
+* Wed Jul 30 2014 Mat Booth <mat.booth(a)redhat.com> - 1.9-4
+- Fix incorrect parent BR causing FTBFS
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 10 months
[javapackages] [osgi.req] Fix type of empty requires cache
by Mikolaj Izdebski
commit aa4c76feb2bb51e14fa7de86da89011226d784ac
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 13:01:12 2014 +0200
[osgi.req] Fix type of empty requires cache
'list' has no attribute 'update'
depgenerators/osgi.req | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 88cb738..8d3bb8b 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -66,7 +66,7 @@ class TagBuilder(object):
# get all provided bundles, try cache first
provided = osgi.read_provided_bundles_cache(cachedir)
if not provided:
- provided = []
+ provided = {}
# no cache, create one
buildroot = config.get_buildroot()
bpaths = osgi.find_possible_bundles(buildroot)
9 years, 10 months