[apache-commons-configuration] Update to upstream 1.8
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Jun 19 09:04:05 UTC 2012
commit e9c57c8ac57d5436340991d1c7d100968b9e3a5a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Jun 19 10:23:30 2012 +0200
Update to upstream 1.8
.gitignore | 1 +
0001-Change-ant-groupId-to-org.apache.ant.patch | 34 -----------------------
apache-commons-configuration.spec | 16 ++++++++---
sources | 2 +-
4 files changed, 14 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 861b427..961d31c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-configuration-1.6-src.tar.gz
+/commons-configuration-1.8-src.tar.gz
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index f838818..c61f437 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -3,15 +3,14 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.6
-Release: 7%{?dist}
+Version: 1.8
+Release: 1%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Patch0: 0001-Change-ant-groupId-to-org.apache.ant.patch
BuildArch: noarch
BuildRequires: java-devel
@@ -63,6 +62,13 @@ Requires(postun): jpackage-utils >= 1.7.2
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
+# for 1.8
+Requires: apache-commons-vfs
+BuildRequires: apache-commons-vfs
+Requires: apache-commons-jexl
+BuildRequires: apache-commons-jexl
+BuildRequires: javacc-maven-plugin
+
%description
Configuration is a project to provide a generic Configuration
interface and allow the source of the values to vary. It
@@ -90,7 +96,6 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
%{__sed} -i 's/\r//' LICENSE.txt
%build
@@ -130,6 +135,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
%changelog
+* Tue Jun 19 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8-1
+- Update to upstream 1.8
+
* Wed Apr 18 2012 Alexander Kurtakov <akurtako at redhat.com> 1.6-7
- Update to current guidelines.
- Move to servlet 3.
diff --git a/sources b/sources
index cb0bad3..97baa5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1caad868ead4e13fe3911494182a1e40 commons-configuration-1.6-src.tar.gz
+d875d81f386cac91ff1790cf08f9e1c5 commons-configuration-1.8-src.tar.gz
More information about the scm-commits
mailing list