From 1221498e96740aec5fa3171d98169d690ffce6a1 Mon Sep 17 00:00:00 2001 From: spike Date: Oct 22 2010 00:16:22 +0000 Subject: Updated to 2.0 Cleaned up BRs --- diff --git a/.gitignore b/.gitignore index 2bd265d..816d6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ commons-io-1.4-src.tar.gz +/commons-io-2.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 0c77fe4..882c054 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,57 +1,58 @@ - %global base_name io %global short_name commons-%{base_name} -Name: apache-%{short_name} -Version: 1.4 -Release: 6%{?dist} -Epoch: 1 -Summary: Utilities to assist with developing IO functionality -License: ASL 2.0 -Group: Development/Libraries -URL: http://commons.apache.org/%{base_name} -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: maven-plugin-bundle -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-doxia-sitetools -BuildRequires: maven2-plugin-assembly -BuildRequires: maven2-plugin-antrun -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-idea -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-javadoc -BuildRequires: maven2-plugin-resources - -Requires: java >= 1:1.6.0 -Requires: jpackage-utils >= 0:1.6 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: apache-%{short_name} +Version: 2.0 +Release: 1%{?dist} +Epoch: 1 +Summary: Utilities to assist with developing IO functionality +License: ASL 2.0 +Group: Development/Libraries +URL: http://commons.apache.org/%{base_name} +Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +BuildArch: noarch + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: junit4 +BuildRequires: maven2 >= 2.2.1 +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-idea-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-bundle +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 + +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This should go away with F-17 -Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release} -Obsoletes: jakarta-%{short_name} <= 0:1.4 +Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release} +Obsoletes: jakarta-%{short_name} <= 0:1.4 %description Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. -%package javadoc -Summary: API documentation for %{name} -Group: Documentation -Requires: jpackage-utils +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils -Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.4 +Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.4 -%description javadoc -%{summary}. +%description javadoc +This package contains the API documentation for %{name}. %prep %setup -q -n %{short_name}-%{version}-src @@ -116,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name} %changelog +* Fri Oct 22 2010 Chris Spike 1:2.0-1 +- Updated to 2.0 +- Cleaned up BRs + * Thu Jul 8 2010 Stanislav Ochotnicky - 1:1.4-6 - Add license to javadoc subpackage @@ -135,4 +140,3 @@ rm -rf $RPM_BUILD_ROOT * Tue May 11 2010 Stanislav Ochotnicky - 1:1.4-1 - Rename and rebase of jakarta-commons-io - Clean up whole spec - diff --git a/sources b/sources index 2f441f5..0a83900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24b228f2d0c40ffed9204cdab015bccf commons-io-1.4-src.tar.gz +c5ce73b7e82b82dffc12bbc846345638 commons-io-2.0-src.tar.gz