From 493fa832db74a18a48b2b75e952472ef9f84de6a Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Wed, 16 Aug 2006 16:57:06 +0000 Subject: [PATCH] Merge with upstream --- postgresql-jdbc.spec | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index b554392..750acf7 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -1,3 +1,35 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} + %define section devel %define upstreamver 8.1-407 %define gcj_support 1 @@ -14,8 +46,7 @@ URL: http://jdbc.postgresql.org/ Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz Patch1: postgresql-jdbc-unspec-string.patch -%if %{gcj_support} -%else +%if ! %{gcj_support} BuildArch: noarch %endif BuildRequires: jpackage-utils >= 0:1.5 @@ -99,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Aug 16 2006 Fernando Nasser 8.1.407-1jpp.3 +- Merge with upstream + * Sat Jul 22 2006 Jakub Jelinek 8.1.407-1jpp.2 - Rebuilt