diff --git a/.cvsignore b/.cvsignore index 76bf7ae..636d5ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -commons-beanutils-1.6.1-src.tar.gz +commons-beanutils-1.7.0-src.tar.gz diff --git a/jakarta-commons-beanutils.spec b/jakarta-commons-beanutils.spec index 248d9d7..e97e57e 100644 --- a/jakarta-commons-beanutils.spec +++ b/jakarta-commons-beanutils.spec @@ -1,8 +1,8 @@ %define base_name beanutils %define short_name commons-%{base_name} %define name jakarta-%{short_name} -%define version 1.6.1 -%define release 4jpp_6rh +%define version 1.7.0 +%define release 1jpp %define section free Name: %{name} @@ -12,16 +12,14 @@ Epoch: 0 Summary: Jakarta Commons BeanUtils Package License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage -Source0: http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.6.1-src.tar.gz +Vendor: JPackage Project +Distribution: JPackage +Source0: http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz Url: http://jakarta.apache.org/commons/%{base_name}/ BuildRequires: ant BuildRequires: jakarta-commons-collections >= 0:2.0 BuildRequires: jakarta-commons-logging >= 0:1.0 BuildRequires: jpackage-utils > 0:1.5 -BuildRequires: coreutils - Requires: jakarta-commons-collections >= 0:2.0 Requires: jakarta-commons-logging >= 0:1.0 BuildArch: noarch @@ -66,16 +64,6 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT -%pre -rm -f %{_javadir}/%{short_name}*.jar -rm -f %{_javadir}/%{name}*.jar - -%triggerpostun -- commons-beanutils < 1.7 -pushd %{_javadir} &> /dev/null - ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar - ln -sf %{short_name}-%{version}.jar %{short_name}.jar -popd &> /dev/null - %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -95,24 +83,11 @@ fi %{_javadocdir}/%{name}-%{version} %changelog -* Fri Oct 1 2004 Andrew Overholt 0:1.6.1-4jpp_6rh -- add coreutils BuildRequires - -* Fri Jul 2 2004 Aizaz Ahmed 0:1.6.1-4jpp_5rh -- Added trigger to restore symlinks that are removed if ugrading - from a commons-beanutils rhug package - -* Fri Apr 2 2004 Frank Ch. Eigler 0:1.6.1-4jpp_4rh -- more of the same, for version-suffixed .jar files - -* Fri Mar 26 2004 Frank Ch. Eigler 0:1.6.1-4jpp_3rh -- add RHUG upgrade cleanup - -* Fri Mar 5 2004 Frank Ch. Eigler 0:1.6.1-4jpp_2rh -- RH vacuuming part II +* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp +- Upgrade to 1.7.0 -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.6.1-4jpp_1rh -- RH vacuuming +* Sun Aug 23 2004 Randy Watler - 0:1.6.1-5jpp +- Rebuild with ant-1.6.2 * Fri May 09 2003 David Walluck 0:1.6.1-4jpp - update for JPackage 1.5 diff --git a/sources b/sources index 695c0b1..e28c2b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f0190fda2d6ec7083e46ed6519aafe5 commons-beanutils-1.6.1-src.tar.gz +3fd5cbdf70363b151de5cd538f726e67 commons-beanutils-1.7.0-src.tar.gz