[apache-commons-dbutils] Updated to 1.5
spike
spike at fedoraproject.org
Wed Oct 24 01:48:18 UTC 2012
commit 39c32b41740e888c87c7ba132459d425b7b7d9a2
Author: spike <spike at fedoraproject.org>
Date: Wed Oct 24 03:47:28 2012 +0200
Updated to 1.5
.gitignore | 1 +
apache-commons-dbutils.spec | 25 +++++++++++++++----------
sources | 2 +-
3 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f225702..db2c6c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/commons-dbutils-1.3-src.tar.gz
commons-dbutils-1.4-src.tar.gz
+/commons-dbutils-1.5-src.tar.gz
diff --git a/apache-commons-dbutils.spec b/apache-commons-dbutils.spec
index 6d889b8..4980a9d 100644
--- a/apache-commons-dbutils.spec
+++ b/apache-commons-dbutils.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.4
-Release: 3%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: Apache Commons DbUtils Package
Group: Development/Libraries
License: ASL 2.0
@@ -14,6 +14,9 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
+BuildRequires: hamcrest
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: mockito
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -37,34 +40,36 @@ This package contains the API documentation for %{name}.
sed -i 's/\r//' *.txt
%build
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# poms
install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}"
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
-%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
%changelog
+* Wed Oct 24 2012 Chris Spike <spike at fedoraproject.org> 1.5-1
+- Updated to 1.5
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index f98558e..1f1109d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a148ec373278f71aabed563c1311b0d commons-dbutils-1.4-src.tar.gz
+23b47312e8d320700ebc44c6ca9016d1 commons-dbutils-1.5-src.tar.gz
More information about the scm-commits
mailing list