Update to upstream version 1.9.2

- Remove legacy Provides/Obsoletes for jakarta-commons-beanutils
This commit is contained in:
Mikolaj Izdebski 2014-06-06 08:32:02 +02:00
parent 6119abc6b3
commit 1972aeeca7
3 changed files with 10 additions and 12 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
commons-beanutils-1.8.3-src.tar.gz commons-beanutils-1.8.3-src.tar.gz
/commons-beanutils-1.9.0-src.tar.gz /commons-beanutils-1.9.0-src.tar.gz
/commons-beanutils-1.9.1-src.tar.gz /commons-beanutils-1.9.1-src.tar.gz
/commons-beanutils-1.9.2-src.tar.gz

View File

@ -2,8 +2,8 @@
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.9.1 Version: 1.9.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
@ -16,9 +16,6 @@ BuildRequires: mvn(commons-collections:commons-collections-testframework)
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(org.apache.commons:commons-parent) BuildRequires: mvn(org.apache.commons:commons-parent)
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 0:1.7.0
%description %description
The scope of this package is to create a package of Java utility methods The scope of this package is to create a package of Java utility methods
for accessing and modifying the properties of arbitrary JavaBeans. No for accessing and modifying the properties of arbitrary JavaBeans. No
@ -52,19 +49,19 @@ sed -i 's/\r//' *.txt
%install %install
%mvn_install %mvn_install
%pre javadoc
# workaround for rpm bug, can be removed in F-20
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files -f .mfiles %files -f .mfiles
%doc README.txt RELEASE-NOTES.txt %doc RELEASE-NOTES.txt
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Fri Jun 6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.2-1
- Update to upstream version 1.9.2
- Remove legacy Provides/Obsoletes for jakarta-commons-beanutils
- Remove RPM bug workaround
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.9.1-2 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.9.1-2
- Use Requires: java-headless rebuild (#1067528) - Use Requires: java-headless rebuild (#1067528)

View File

@ -1 +1 @@
b30dd2ddaac6fe68ae0fba3db082340e commons-beanutils-1.9.1-src.tar.gz 13233b217eca7af8abdfa66a20dcc020 commons-beanutils-1.9.2-src.tar.gz