From 17caceac94b9c6d18b0bd7220b460fd9e3447981 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 14 Jul 2014 09:06:24 +0200 Subject: [PATCH] build: revert back upstream fix for travis-build .. which broke our ant building. This needs more investigation though (based on upstream mailing list discussion, ant 1.9.4 should work fine). Version: 9.3.1102-1 --- postgresql-jdbc.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index dbbe2c3..0253896 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -29,11 +29,12 @@ # %global section devel -%global upstreamver 9.3-1101 +%global upstreamrel 1102 +%global upstreamver 9.3-%{upstreamrel} Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 9.3.1102 +Version: 9.3.%{upstreamrel} Release: 1%{?dist} # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD License: BSD and ASL 2.0 @@ -44,6 +45,12 @@ Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz # originally http://repo2.maven.org/maven2/postgresql/postgresql/8.4-701.jdbc4/postgresql-8.4-701.jdbc4.pom: Source1: %{name}.pom +# Revert back fix for travis build which breaks our ant-build for version 1.9.2 +# & 1.9.4. +# ~> downstream +# ~> 1118667 +Patch0: postgresql-jdbc-9.3-1102-revert-88b9a034.patch + BuildArch: noarch BuildRequires: java-devel >= 1:1.8 BuildRequires: jpackage-utils @@ -71,11 +78,14 @@ This package contains the API Documentation for %{name}. %setup -c -q mv -f %{name}-%{upstreamver}.src/* . rm -f %{name}-%{upstreamver}.src/.gitignore +rm -f %{name}-%{upstreamver}.src/.travis.yml rmdir %{name}-%{upstreamver}.src # remove any binary libs find -name "*.jar" -or -name "*.class" | xargs rm -f +%patch0 -p1 -b .revert-travis-fix + %build export OPT_JAR_LIST="ant/ant-junit junit" export CLASSPATH= @@ -134,8 +144,9 @@ test $? -eq 0 && { cat test.log ; exit 1 ; } %doc %{_javadocdir}/%{name} %changelog -* Fri Jul 11 2014 Pavel Raiskup - 9.3.1102-1 +* Mon Jul 14 2014 Pavel Raiskup - 9.3.1102-1 - Rebase to most recent version (#1118667) +- revert back upstream commit for travis build * Sat Jun 07 2014 Fedora Release Engineering - 9.3.1101-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild