rpms/xmlrpc3/devel xmlrpc3-common-addosgimanifest.patch, 1.1, 1.2 .cvsignore, 1.1, 1.2 xmlrpc3.spec, 1.8, 1.9

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23933/devel

Modified Files:
	xmlrpc3-common-addosgimanifest.patch .cvsignore xmlrpc3.spec 
Log Message:
- Drop gcj_support.
- Fix commons osgi manifest.

xmlrpc3-common-addosgimanifest.patch:

Index: xmlrpc3-common-addosgimanifest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3-common-addosgimanifest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlrpc3-common-addosgimanifest.patch	7 Sep 2007 17:53:10 -0000	1.1
+++ xmlrpc3-common-addosgimanifest.patch	22 Oct 2008 17:53:11 -0000	1.2
@@ -13,7 +13,7 @@
 +			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
 +			    <Bundle-Name>%Bundle-Name</Bundle-Name>
 +			    <Bundle-Localization>plugin</Bundle-Localization>
-+			    <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
++			    <Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
 +			    <Bundle-Version>3.0.0.qualifier</Bundle-Version>
 +			    <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common, org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer, org.apache.xmlrpc.util</Export-Package>
 +			    <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2007 16:23:14 -0000	1.1
+++ .cvsignore	22 Oct 2008 17:53:11 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-3.0-src.tar.gz


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmlrpc3.spec	12 Sep 2008 14:29:08 -0000	1.8
+++ xmlrpc3.spec	22 Oct 2008 17:53:11 -0000	1.9
@@ -29,9 +29,6 @@
 #
 
 %define mainname xmlrpc
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:       xmlrpc3
 Version:    3.0
@@ -79,17 +76,9 @@
 Requires:       ws-jaxme
 Requires:       ws-commons-util
 
-%if ! %{gcj_support}
 Buildarch:    noarch
-%endif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%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
 that uses XML over HTTP to implement remote procedure calls.
@@ -202,29 +191,9 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
@@ -234,9 +203,6 @@
 %doc LICENSE.txt
 %{_javadir}/%{name}-common.jar
 %{_javadir}/%{name}-common-%{version}.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/%{name}-common*
-%endif
 
 %files common-devel
 %defattr(-,root,root,-)
@@ -246,9 +212,6 @@
 %defattr(-,root,root,-)
 %{_javadir}/%{name}-client.jar
 %{_javadir}/%{name}-client-%{version}.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/%{name}-client*
-%endif
 
 %files client-devel
 %defattr(-,root,root,-)
@@ -258,15 +221,16 @@
 %defattr(-,root,root,-)
 %{_javadir}/%{name}-server.jar
 %{_javadir}/%{name}-server-%{version}.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/%{name}-server*
-%endif
 
 %files server-devel
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Wed Oct 22 2008 Alexander Kurtakov <akurtako at redhat.com> 3.0-2.8
+- Drop gcj_support.
+- Fix commons osgi manifest.
+
 * Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 3.0-2.7
 - Add ppc64.