rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: fnasser

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3461

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Merge with upstream




Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- postgresql-jdbc.spec	22 Jul 2006 08:45:07 -0000	1.5
+++ postgresql-jdbc.spec	16 Aug 2006 16:57:06 -0000	1.6
@@ -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 @@
 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 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Fernando Nasser <fnasser at redhat.com> 8.1.407-1jpp.3
+- Merge with upstream
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 8.1.407-1jpp.2
 - Rebuilt