[hsqldb/f17] Fixed symlink

Tomas Radej tradej at fedoraproject.org
Thu Mar 8 15:45:21 UTC 2012


commit 3e13ada5c8d7faa903c2f346c787a2a439d6b5ee
Author: Tomas Radej <tradej at redhat.com>
Date:   Thu Mar 8 15:51:00 2012 +0100

    Fixed symlink

 hsqldb.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/hsqldb.spec b/hsqldb.spec
index 1c49ff1..8ec2151 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -32,7 +32,7 @@
 
 Name:       hsqldb
 Version:    1.8.1.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 Epoch:      1
 Summary:    HyperSQL Database Engine
 License:    BSD
@@ -48,6 +48,7 @@ Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
 Patch3:     %{name}-jdbc-4.1.patch
 Requires:   servlet25
+Requires:   java
 Requires(post):   coreutils
 Requires(preun):  coreutils
 Requires(preun): initscripts
@@ -173,7 +174,9 @@ install -pD -T -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
 
 pushd $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib
-    ln -s $(build-classpath hsqldb) hsqldb.jar
+    # build-classpath can not be used as the jar is not
+    # yet present during the build
+    ln -s %{_javadir}/hsqldb.jar hsqldb.jar
     ln -s $(build-classpath servlet) servlet.jar
 popd
 
@@ -235,6 +238,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_datadir}/%{name}
 
 %changelog
+* Thu Mar 08 2012 Tomas Radej <tradej at redhat.com> - 1:1.8.1.3-6
+- Fixed symlink
+
 * Tue Jan 24 2012 Deepak Bhole <dbhole at redhat.com> - 1:1.8.1.3-5
 - Added patch to support JDBC 4.1/Java 7
 


More information about the scm-commits mailing list