rebase to 9.4.1200

Resolves: #1188827
Version: 9.4.1200-1
This commit is contained in:
Pavel Raiskup 2015-02-04 09:42:36 +01:00
parent 0fbc33b4a2
commit 99bd0757b5
3 changed files with 13 additions and 7 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/postgresql-jdbc-9.3-1102.src.tar.gz
/postgresql-jdbc-9.4-1200.src.tar.gz

View File

@ -29,12 +29,12 @@
#
%global section devel
%global upstreamrel 1102
%global upstreamver 9.3-%{upstreamrel}
%global upstreamrel 1200
%global upstreamver 9.4-%{upstreamrel}
Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc
Version: 9.3.%{upstreamrel}
Version: 9.4.%{upstreamrel}
Release: 1%{?dist}
# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
License: BSD and ASL 2.0
@ -128,8 +128,11 @@ install -d build/publicapi docs/%{name}
%if 0%{?runselftest}
# Note that this requires to have PostgreSQL properly configured; for this
# reason the testsuite is turned off by default (see org/postgresql/test/README)
ant test 2>&1 | tee test.log | grep FAILED
test $? -eq 0 && { cat test.log ; exit 1 ; }
test_log=test.log
# TODO: more reliable testing
ant test 2>&1 | tee "$test_log" || :
( test -f "$test_log" && ! grep FAILED "$test_log" )
%endif
@ -144,6 +147,9 @@ test $? -eq 0 && { cat test.log ; exit 1 ; }
%doc %{_javadocdir}/%{name}
%changelog
* Wed Feb 04 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.1200-1
- rebase to most recent version (#1188827)
* Mon Jul 14 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.1102-1
- Rebase to most recent version (#1118667)
- revert back upstream commit for travis build

View File

@ -1 +1 @@
29c61fe811f1ee54a6367ca81b558e8f postgresql-jdbc-9.3-1102.src.tar.gz
6feafab5bc01ae9854e3cd8532adad54 postgresql-jdbc-9.4-1200.src.tar.gz