X-Git-Url: http://git.pld-linux.org/?p=packages%2Fjava-commons-daemon.git;a=blobdiff_plain;f=java-commons-daemon.spec;h=4a5853aa0afb4874782647722e728e247c1093b1;hp=680e246810e1c63050c5d3f129154121eb5a16cc;hb=cda1e4717755cede8ecef5ad201f35ecedcb2742;hpb=572f3ecb20c0bc00fc8291ab1771fa669907b1d4

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 680e246..4a5853a 100644
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,39 +1,30 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
-
 %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.1
-Release:	5
+Version:	1.0.2
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://www.apache.org/dist/commons/daemon/source/daemon-%{version}.tar.gz
-# Source0-md5:	df3eb5aafa53ca530843a09d40b8a1c0
+Source0:	http://www.apache.net.pl/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
+# Source0-md5:	a6c68eed204bc9f1ef3b77488edfcfeb
 Patch0:		jakarta-commons-daemon-link.patch
 URL:		http://commons.apache.org/daemon/
 BuildRequires:	ant >= 1.4.1
 BuildRequires:	automake
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java-junit >= 3.7
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 3.7
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	java-commons-collections >= 2.0
 Requires:	java-commons-logging >= 1.0
 Requires:	jpackage-utils
-Provides:	jakarta-commons-daemon
 Obsoletes:	jakarta-commons-daemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,7 +44,6 @@ Summary:	Commons Daemon documentation
 Summary(pl.UTF-8):	Dokumentacja do Commons Daemon
 Group:		Documentation
 Requires:	jpackage-utils
-Provides:	jakarta-commons-daemon-javadoc
 Obsoletes:	jakarta-commons-daemon-doc
 Obsoletes:	jakarta-commons-daemon-javadoc
 
@@ -64,8 +54,8 @@ Commons Daemon documentation.
 Dokumentacja do Commons Daemon.
 
 %prep
-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+
 %patch0 -p1
 
 %build
@@ -88,7 +78,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
@@ -110,7 +100,7 @@ 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
 %attr(755,root,root) %{_bindir}/jsvc
 %{_mandir}/man1/jsvc.1*
 %{_javadir}/*.jar