rpms/xmlrpc/devel xmlrpc.spec,1.15,1.16

Sat Aug 5 00:17:23 UTC 2006

Author: vivekl

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18415

Modified Files:
	xmlrpc.spec 
Log Message:
- Merge with latest from JPP.




Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16

--- xmlrpc.spec	22 Jul 2006 08:46:58 -0000	1.15
+++ xmlrpc.spec	5 Aug 2006 00:17:20 -0000	1.16
@@ -1,12 +1,40 @@
-%define name		xmlrpc
-%define version		2.0.1
-%define release		1jpp_8.2fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%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	section		free
-%define gcj_support     1
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		xmlrpc
+Version:	2.0.1
+Release:	3jpp.1
 Epoch:		0
 Summary:	Java XML-RPC implementation
 License:	Apache Software License
@@ -14,28 +42,25 @@
 Url:		http://xml.apache.org/%{name}/
 Source0:	http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
 Requires:	servletapi5
-Requires:	commons-httpclient >= 2.0.2
-Requires:	commons-codec >= 1.3
-Requires:	junit >= 3.8.1
-%if %{gcj_support}
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(postun):	coreutils
-Requires(postun):	coreutils
-BuildRequires:	java-gcj-compat-devel >= 1.0.33
-%endif
+Requires:	jakarta-commons-httpclient
+Requires:	jakarta-commons-codec >= 1.3
+Requires:	junit
 BuildRequires:	ant
-BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	servletapi5
-BuildRequires:	junit >= 3.8.1
-BuildRequires:	commons-httpclient >= 2.0.2	
-BuildRequires:	commons-codec >= 1.3
+BuildRequires:	junit
+BuildRequires:	jakarta-commons-httpclient
+BuildRequires:	jakarta-commons-codec >= 1.3
+%if ! %{gcj_support}
+Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-#Distribution:	JPackage
-#Vendor:		JPackage Project
 
-# s390 excluded due to eclipse
-ExcludeArch: s390x ppc64 s390
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -47,12 +72,9 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Java
-%if %{gcj_support}
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(post):		java-gcj-compat >= 1.0.33
-%endif
-Requires(postun):	coreutils
-Requires(postun):	coreutils
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -82,7 +104,7 @@
 cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
 %endif
 
 %clean
@@ -91,29 +113,46 @@
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
 
 %postun javadoc
 if [ "$1" = "0" ]; then
     rm -f %{_javadocdir}/%{name}
 fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 %endif
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt README.txt
 %{_javadir}/*
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xmlrpc-applet-2.0.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.0.1-3jpp.1
+- Merge with latest from JPP.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.0.1-1jpp_8.2fc
 - Rebuilt
 


