From 2181e8a6d35770913ed8a48c2569cfe76451e938 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 23 Apr 2014 09:51:20 +0200 Subject: [PATCH] rebase to 9.3 Resolves: #1090366 Version: 9.3.1101-1 --- .gitignore | 2 +- postgresql-jdbc.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 58ba3ef..46aabe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/postgresql-jdbc-9.2-1002.src.tar.gz +/postgresql-jdbc-9.3-1101.src.tar.gz diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 5c56ca0..aa2ad29 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -29,12 +29,12 @@ # %global section devel -%global upstreamver 9.2-1002 +%global upstreamver 9.3-1101 Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 9.2.1002 -Release: 5%{?dist} +Version: 9.3.1101 +Release: 1%{?dist} # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD License: BSD and ASL 2.0 Group: Applications/Databases @@ -91,7 +91,8 @@ ant jar publicapi install -d $RPM_BUILD_ROOT%{_javadir} # Per jpp conventions, jars have version-numbered names and we add # versionless symlinks. -install -m 644 jars/postgresql.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -m 644 jars/postgresql-%{upstreamver}.jdbc41.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + pushd $RPM_BUILD_ROOT%{_javadir} # Also, for backwards compatibility with our old postgresql-jdbc packages, @@ -112,7 +113,7 @@ cp -ra build/publicapi $RPM_BUILD_ROOT%{_javadocdir}/%{name} install -d build/publicapi docs/%{name} %files -f .mfiles -%doc LICENSE README doc/* +%doc LICENSE README.md doc/* %{_javadir}/%{name}2.jar %{_javadir}/%{name}2ee.jar %{_javadir}/%{name}3.jar @@ -122,6 +123,9 @@ install -d build/publicapi docs/%{name} %doc %{_javadocdir}/%{name} %changelog +* Wed Apr 23 2014 Pavel Raiskup - 9.3.1101-1 +- Rebase to most recent version (#1090366) + * Fri Mar 28 2014 Michael Simacek - 9.2.1002-5 - Use Requires: java-headless rebuild (#1067528) diff --git a/sources b/sources index 4dc0925..fb83700 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c8bc0aadd5fe3e7d6bb7a0e55606b00 postgresql-jdbc-9.2-1002.src.tar.gz +667569bbe5b0dcfb46d2bae92cafab04 postgresql-jdbc-9.3-1101.src.tar.gz