Rel 2; allow building with openjdk11

[packages/java-commons-daemon.git] / java-commons-daemon.spec

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index e3b65582f4a06d61bcfa49c28745c2187e1c4249..c4db6037bae5e4aa682f480ff68a85ff34f6d192 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,21 +1,22 @@
 # Conditional build:
 %bcond_without javadoc         # don't build javadoc
-%include       /usr/lib/rpm/macros.java
 
 %define                srcname commons-daemon
 Summary:       Commons Daemon - controlling of Java daemons
 Summary(pl.UTF-8):     Commons Daemon - kontrolowanie demonów w Javie
 Name:          java-commons-daemon
-Version:       1.0.2
-Release:       1
+Version:       1.1.0
+Release:       2
 License:       Apache v2.0
 Group:         Libraries/Java
-Source0:       http://www.apache.net.pl/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
-# Source0-md5: a6c68eed204bc9f1ef3b77488edfcfeb
-Patch0:                jakarta-commons-daemon-link.patch
+# -Source0:       http://www.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
+Source0:       https://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
+# Source0-md5: e5a08e844412147a61a7ef9a19f39978
+Patch0:                build.patch
 URL:           http://commons.apache.org/daemon/
 BuildRequires: ant >= 1.4.1
 BuildRequires: automake
+BuildRequires: docbook-dtd412-xml
 BuildRequires: java-junit >= 3.7
 BuildRequires: jdk
 BuildRequires: jpackage-utils
@@ -39,6 +40,20 @@ zbiór interfejsów w Javie, które muszą być zaimplementowane w
 aplikacjach oraz natywny kod uniksowy kontrolujący demony w Javie w
 systemie Unix.
 
+%package -n jsvc
+Summary:       Commons Daemon jsvc utility
+Summary(pl.UTF-8):     Narzędzie jsvc Commons Daemon
+Group:         Applications
+Requires:      %{name} = %{version}-%{release}
+
+%description -n jsvc
+Jsvc is a set of libraries and applications for making Java
+applications run on UNIX more easily.
+
+%description -n jsvc -l pl.UTF-8
+Jsvc jest zestawem bibliotek i aplikacji które ułatwiają uruchamianie
+aplikacji Javy.
+
 %package javadoc
 Summary:       Commons Daemon documentation
 Summary(pl.UTF-8):     Dokumentacja do Commons Daemon
@@ -55,7 +70,6 @@ Dokumentacja do Commons Daemon.
 
 %prep
 %setup -q -n %{srcname}-%{version}-src
-
 %patch0 -p1
 
 %build
@@ -78,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -a dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # javadoc
@@ -100,10 +114,13 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%doc PROPOSAL.html RELEASE-NOTES.txt STATUS.html
+%doc PROPOSAL.html RELEASE-NOTES.txt README
+%{_javadir}/*.jar
+
+%files -n jsvc
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/jsvc
 %{_mandir}/man1/jsvc.1*
-%{_javadir}/*.jar
 
 %if %{with javadoc}
 %files javadoc