rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.16, 1.17

[Permaine Cheung (pcheung)]

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20049

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
Fix bugzilla 242917




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-daemon.spec	16 Mar 2007 20:03:46 -0000	1.16
+++ jakarta-commons-daemon.spec	19 Sep 2007 21:45:18 -0000	1.17
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,18 +32,18 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define native      %{?_with_native:1}%{!?_with_native:0}
+%define native      %{?_without_native:0}%{!?_without_native:1}
 
 %define base_name   daemon
 %define short_name  commons-%{base_name}
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        6jpp.2%{?dist}
+Release:        6jpp.3%{?dist}
 Epoch:          1
 Summary:        Defines API to support an alternative invocation mechanism
-License:        Apache Software License
-Group:          System/Boot
+License:        ASL 2.0
+Group:          Applications/System
 URL:            http://jakarta.apache.org/commons/daemon/
 Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
 Patch:          %{name}-crosslink.patch
@@ -51,12 +51,12 @@
 
 %if %{native}
 BuildRequires:  java-devel
-%else
+BuildRequires:  xmlto
+%endif
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRequires:  ant, java-javadoc
-%endif
 BuildRequires:  jpackage-utils >= 0:1.6
 Provides:       %{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
@@ -77,7 +77,7 @@
 
 %package        jsvc
 Summary:        Java daemon launcher
-Group:          System/Boot
+Group:          Applications/System
 Provides:       jsvc = %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
@@ -91,7 +91,7 @@
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -103,23 +103,28 @@
 %setup -q -n %{base_name}-%{version}
 %patch0 -p0
 chmod 644 src/samples/*
+%if %{native}
+pushd src/native/unix
+xmlto man man/jsvc.1.xml
+popd
+%endif
 
 
 %build
+ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %if %{native}
 cd src/native/unix
 %configure --with-java=%{java_home}
 make %{?_smp_mflags}
-%else
-ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{native}
-install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_sbindir}/jsvc
-%else
+install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
+install -Dpm 0644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
+%endif
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 dist/%{short_name}.jar \
@@ -130,18 +135,14 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
 
-%if ! %{native}
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if ! %{native}
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -157,14 +158,14 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
-%endif
 
 %if %{native}
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
-%{_sbindir}/jsvc
-%else
+%{_bindir}/jsvc
+%{_mandir}/man1/jsvc.1*
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -174,7 +175,6 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -184,6 +184,16 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 James Ralston <ralston at pobox.com> - 1:1.0.1-6jpp.3
+- update License tag to reflect new acceptable licenses
+- update main Group tag (old value "System/Boot" is invalid)
+- update jsvc Group tag as well
+- update javadoc Group tag as well
+- building jsvc is no longer mutually exclusive with building javadoc
+- jsvc is built by default (use "--without native" to disable)
+- build jsvc man page from DocBook source via xmlto; install
+- move jsvc from sbindir to bindir (man page is section 1)
+
 * Fri Jan 26 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0.1-6jpp.2
 - Added versioning to provides and obsoletes and rpmlint cleanup