Accepting request 857894 from home:pmonrealgonzalez:branches:Java:packages
- Fix service section to use the libexec directory [bsc#1179973] - Add After=network.target to systemd service - Remove bundled servlet api OBS-URL: https://build.opensuse.org/request/show/857894 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=40
This commit is contained in:
parent
8f9bab6c01
commit
8596d74523
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 19:30:22 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
|
||||||
|
|
||||||
|
- Fix service section to use the libexec directory [bsc#1179973]
|
||||||
|
- Add After=network.target to systemd service
|
||||||
|
- Remove bundled servlet api
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jun 12 15:07:02 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
Wed Jun 12 15:07:02 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
18
hsqldb.spec
18
hsqldb.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package hsqldb
|
# spec file for package hsqldb
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2020 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -12,7 +12,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ Release: 0
|
|||||||
Summary: HyperSQL Database Engine
|
Summary: HyperSQL Database Engine
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Productivity/Databases/Servers
|
Group: Productivity/Databases/Servers
|
||||||
Url: http://hsqldb.sourceforge.net/
|
URL: http://hsqldb.org/
|
||||||
Source0: http://downloads.sourceforge.net/hsqldb/%{name}-%{version}.zip
|
Source0: http://downloads.sourceforge.net/hsqldb/%{name}-%{version}.zip
|
||||||
Source1: hsqldb-1.8.0-standard.cfg
|
Source1: hsqldb-1.8.0-standard.cfg
|
||||||
Source2: hsqldb-1.8.0-standard-server.properties
|
Source2: hsqldb-1.8.0-standard-server.properties
|
||||||
@ -48,14 +48,15 @@ Patch1: %{name}-cmdline.patch
|
|||||||
Patch2: hsqldb-2.4.1-javadoc10.patch
|
Patch2: hsqldb-2.4.1-javadoc10.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: glassfish-servlet-api
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 1.8
|
||||||
# Needed for maven conversions
|
# Needed for maven conversions
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: servletapi5
|
BuildRequires: servletapi5
|
||||||
BuildRequires: pkgconfig(systemd)
|
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
|
BuildRequires: pkgconfig(systemd)
|
||||||
Requires: java >= 1.8
|
Requires: java >= 1.8
|
||||||
Requires: servletapi5
|
Requires: servletapi5
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -116,6 +117,7 @@ find . -name _notes -exec rm -rf {} +
|
|||||||
find . -name "*.jar" -exec rm -f {} +
|
find . -name "*.jar" -exec rm -f {} +
|
||||||
find . -name "*.class" -exec rm -f {} +
|
find . -name "*.class" -exec rm -f {} +
|
||||||
find . -name "*.war" -exec rm -f {} +
|
find . -name "*.war" -exec rm -f {} +
|
||||||
|
find . -name "*.zip" -exec rm -f {} +
|
||||||
|
|
||||||
# correct silly permissions
|
# correct silly permissions
|
||||||
chmod -R go=u-w *
|
chmod -R go=u-w *
|
||||||
@ -129,11 +131,9 @@ sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
|
|||||||
%patch2 -p2
|
%patch2 -p2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CLASSPATH=$(build-classpath servletapi5 junit)
|
|
||||||
|
|
||||||
pushd build
|
pushd build
|
||||||
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8 -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7"
|
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8 -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7"
|
||||||
ant hsqldb javadoc
|
ant hsqldb javadoc -Dservletapi.lib=$(build-classpath glassfish-servlet-api)
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -154,8 +154,6 @@ install -d -m 0755 %{buildroot}/%{_sbindir}/
|
|||||||
ln -sf service %{buildroot}/%{_sbindir}/rc%{name}
|
ln -sf service %{buildroot}/%{_sbindir}/rc%{name}
|
||||||
|
|
||||||
# sysconfig
|
# sysconfig
|
||||||
#install -d -m 0755 %{buildroot}%{_fillupdir}
|
|
||||||
#install -m 700 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name}
|
|
||||||
install -d -m 0755 %{buildroot}/%{_sysconfdir}
|
install -d -m 0755 %{buildroot}/%{_sysconfdir}
|
||||||
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
|
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
|
||||||
|
|
||||||
@ -194,7 +192,7 @@ pushd %{buildroot}%{_localstatedir}/lib/%{name}/lib
|
|||||||
# build-classpath can not be used as the jar is not
|
# build-classpath can not be used as the jar is not
|
||||||
# yet present during the build
|
# yet present during the build
|
||||||
ln -s %{_javadir}/hsqldb.jar hsqldb.jar
|
ln -s %{_javadir}/hsqldb.jar hsqldb.jar
|
||||||
ln -s $(build-classpath servletapi5) servletapi5.jar
|
ln -s $(build-classpath glassfish-servlet-api) servletapi5.jar
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%fdupes -s %{buildroot}
|
%fdupes -s %{buildroot}
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=HyperSQL Database Engine
|
Description=HyperSQL Database Engine
|
||||||
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
User=hsqldb
|
User=hsqldb
|
||||||
Group=hsqldb
|
Group=hsqldb
|
||||||
ExecStart=/usr/lib/hsqldb/hsqldb-wrapper
|
ExecStart=/usr/libexec/hsqldb/hsqldb-wrapper
|
||||||
ExecStartPost=/usr/lib/hsqldb/hsqldb-post
|
ExecStartPost=/usr/libexec/hsqldb/hsqldb-post
|
||||||
ExecStop=/usr/lib/hsqldb/hsqldb-stop
|
ExecStop=/usr/libexec/hsqldb/hsqldb-stop
|
||||||
SuccessExitStatus=143
|
SuccessExitStatus=143
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
Loading…
Reference in New Issue
Block a user