fix postgresql-jdbc.jar symlink using javapackages macros
- adapt to current guideline - install doc and license file in parent-poms sub package - simplified runselftest check Resolves: rhbz#1217395 Version: 9.4.1209-5
This commit is contained in:
gil
Pavel Raiskup
parent
1b7d8b4f59
commit
668b4398f9
@ -1,52 +0,0 @@
|
||||
commit 7fe0e29ab432a4ce0753f287db4efcd8a441c6e1 (HEAD, REL9_3_STABLE)
|
||||
Author: Pavel Raiskup <praiskup@redhat.com>
|
||||
AuthorDate: Mon Jul 14 09:00:03 2014 +0200
|
||||
Commit: Pavel Raiskup <praiskup@redhat.com>
|
||||
CommitDate: Mon Jul 14 09:00:03 2014 +0200
|
||||
|
||||
Revert "backpatch fix to build to allow travis CI to build it"
|
||||
|
||||
This reverts commit 88b9a034c8dd86a1de961f370e548cac74ed1031.
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 152517d..2b86a36 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -106,10 +106,6 @@
|
||||
<include name="${package}/xa/jdbc4/*.java" if="jdbc4any"/>
|
||||
</patternset>
|
||||
|
||||
- <artifact:dependencies pathId="dependency.classpath" useScope="test">
|
||||
- <dependency groupId="junit" artifactId="junit" version="3.8.2" scope="test"/>
|
||||
- </artifact:dependencies>
|
||||
-
|
||||
<target name="check_versions">
|
||||
<condition property="jdbc2">
|
||||
<or>
|
||||
@@ -233,7 +229,6 @@
|
||||
<fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
|
||||
|
||||
<javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
|
||||
- <classpath refid="dependency.classpath" />
|
||||
<patternset refid="jdbc.version.src.pattern"/>
|
||||
</javac>
|
||||
</target>
|
||||
@@ -434,9 +429,9 @@
|
||||
|
||||
<!-- This compiles and builds the test jarfile. -->
|
||||
<target name="testjar" depends="jar">
|
||||
+ <fail message="JUnit could not be found in your classpath. You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
|
||||
<mkdir dir="${builddir}/tests"/>
|
||||
<javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}" source="${java.specification.version}">
|
||||
- <classpath refid="dependency.classpath" />
|
||||
<include name="${package}/test/**" />
|
||||
|
||||
<exclude name="${package}/test/jdbc4/**" unless="jdbc4tests" />
|
||||
@@ -472,7 +467,6 @@
|
||||
<sysproperty key="protocolVersion" value="${protocolVersion}" />
|
||||
<sysproperty key="ssltest.properties" value="${ssltest.properties}" />
|
||||
|
||||
- <classpath refid="dependency.classpath" />
|
||||
<classpath>
|
||||
<pathelement location="${artifact.jar}" />
|
||||
<pathelement location="${jardir}/postgresql-tests.jar" />
|
||||
@ -1,23 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>PostgreSQL JDBC Driver</name>
|
||||
|
||||
<version>UPSTREAM_VERSION</version>
|
||||
<url>http://jdbc.postgresql.org</url>
|
||||
<description>The PostgreSQL Driver JDBC4</description>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>BSD License</name>
|
||||
<url>http://jdbc.postgresql.org/license.html</url>
|
||||
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
<scm>
|
||||
<url>http://gborg.postgresql.org/project/pgjdbc/cvs/cvs.php</url>
|
||||
</scm>
|
||||
</project>
|
||||
@ -47,10 +47,9 @@
|
||||
Summary: JDBC driver for PostgreSQL
|
||||
Name: postgresql-jdbc
|
||||
Version: %upstreammajor.%{upstreamrel}
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
|
||||
License: BSD and ASL 2.0
|
||||
Group: Applications/Databases
|
||||
URL: http://jdbc.postgresql.org/
|
||||
|
||||
Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%version.tar.gz
|
||||
@ -63,7 +62,6 @@ Source2: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver.tar
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: java-comment-preprocessor
|
||||
BuildRequires: properties-maven-plugin
|
||||
@ -78,8 +76,6 @@ BuildRequires: postgresql-contrib
|
||||
|
||||
# gettext is only needed if we try to update translations
|
||||
#BuildRequires: gettext
|
||||
Requires: jpackage-utils
|
||||
Requires: java-headless >= 1:1.8
|
||||
|
||||
%description
|
||||
PostgreSQL is an advanced Object-Relational database management
|
||||
@ -88,7 +84,7 @@ Java programs to access a PostgreSQL database.
|
||||
|
||||
|
||||
%package parent-poms
|
||||
Summary: Build dependency management for pgjdbc.
|
||||
Summary: Build dependency management for PostgreSQL JDBC driver.
|
||||
|
||||
%description parent-poms
|
||||
Pom files bringing dependencies required for successful PostgreSQL JDBC driver
|
||||
@ -97,7 +93,6 @@ build.
|
||||
|
||||
%package javadoc
|
||||
Summary: API docs for %{name}
|
||||
Group: Documentation
|
||||
|
||||
%description javadoc
|
||||
This package contains the API Documentation for %{name}.
|
||||
@ -120,6 +115,10 @@ find -name "*.jar" -or -name "*.class" | xargs rm -f
|
||||
%pom_xpath_inject pom:parent "<relativePath>pgjdbc-parent-poms/pgjdbc-versions</relativePath>"
|
||||
%pom_xpath_set pom:relativePath ../pgjdbc-parent-poms/pgjdbc-core-parent pgjdbc
|
||||
|
||||
# compat symlink: requested by dtardon (libreoffice), reverts part of
|
||||
# 0af97ce32de877 commit.
|
||||
%mvn_file org.postgresql:postgresql %{name}/postgresql %{name}
|
||||
|
||||
# Parent POMs should be installed in a separate subpackage.
|
||||
%mvn_package ":*{parent,versions,prevjre}*" parent-poms
|
||||
|
||||
@ -160,41 +159,34 @@ EOF
|
||||
|
||||
# Start the local PG cluster.
|
||||
pgtests_start
|
||||
%endif
|
||||
|
||||
%if %runselftest
|
||||
%mvn_build -- %pgjdbc_mvn_options
|
||||
%else
|
||||
%mvn_build -- %pgjdbc_mvn_options -Dmaven.test.skip=true
|
||||
# -f is equal to -Dmaven.test.skip=true
|
||||
opts="-f"
|
||||
%endif
|
||||
|
||||
%mvn_build $opts -- %pgjdbc_mvn_options
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}
|
||||
# compat symlink: requested by dtardon (libreoffice), reverts part of
|
||||
# 0af97ce32de877 commit.
|
||||
ln -s %{name}/postgresql.jar postgresql-jdbc.jar
|
||||
popd
|
||||
|
||||
|
||||
%check
|
||||
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_javadir}/%{name}.jar
|
||||
|
||||
%files parent-poms -f .mfiles-parent-poms
|
||||
|
||||
%files javadoc
|
||||
%license LICENSE
|
||||
%doc %{_javadocdir}/%{name}
|
||||
%doc pgjdbc-parent-poms/CHANGELOG.md pgjdbc-parent-poms/README.md
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2016 gil cattaneo <puntogil@libero.it> 9.4.1209-5
|
||||
- fix postgresql-jdbc.jar symlink using javapackages macros
|
||||
- adapt to current guideline
|
||||
- install doc and license file in parent-poms sub package
|
||||
- simplified runselftest check
|
||||
|
||||
* Wed Jul 20 2016 Pavel Raiskup <praiskup@redhat.com> - 9.4.1209-4
|
||||
- restore one compat symlink
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user