rpms/jakarta-commons-httpclient/devel jakarta-commons-httpclient-addosgimanifest.patch, NONE, 1.1 jakarta-commons-httpclient.spec, 1.18, 1.19

[Permaine Cheung (pcheung)]

Author: pcheung

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

Modified Files:
	jakarta-commons-httpclient.spec 
Added Files:
	jakarta-commons-httpclient-addosgimanifest.patch 
Log Message:
Add OSGi MANIFEST.MF information



jakarta-commons-httpclient-addosgimanifest.patch:

--- NEW FILE jakarta-commons-httpclient-addosgimanifest.patch ---
--- MANIFEST.MF	2007-09-06 12:31:02.000000000 -0400
+++ /tmp/orb/org.apache.commons.httpclient/META-INF/MANIFEST.MF	2007-09-06 12:30:45.000000000 -0400
@@ -3,4 +3,27 @@
 Specification-Version: 1.0
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: @version@
-
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.httpclient
+Bundle-Version: 3.0.1.qualifier
+Import-Package: javax.crypto;resolution:=optional,
+ javax.crypto.spec;resolution:=optional,
+ javax.net;resolution:=optional,
+ javax.net.ssl;resolution:=optional,
+ org.apache.commons.codec;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.binary;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.net;version="[1.2.0,2.0.0)",
+ org.apache.commons.logging;version="[1.0.4,2.0.0)"
+Export-Package: org.apache.commons.httpclient;version="3.0.1",
+ org.apache.commons.httpclient.auth;version="3.0.1",
+ org.apache.commons.httpclient.cookie;version="3.0.1",
+ org.apache.commons.httpclient.methods;version="3.0.1",
+ org.apache.commons.httpclient.methods.multipart;version="3.0.1",
+ org.apache.commons.httpclient.params;version="3.0.1",
+ org.apache.commons.httpclient.protocol;version="3.0.1",
+ org.apache.commons.httpclient.util;version="3.0.1"
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.2


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-httpclient.spec	16 Mar 2007 18:10:37 -0000	1.18
+++ jakarta-commons-httpclient.spec	6 Sep 2007 17:48:22 -0000	1.19
@@ -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
@@ -36,12 +36,14 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.0.1
-Release:        1jpp.1%{?dist}
+Release:        1jpp.2%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        Apache Software License
 Source0:        http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0.1-src.tar.gz
 Patch0:         %{name}-disablecryptotests.patch
+# Add OSGi MANIFEST.MF bits
+Patch1:         %{name}-addosgimanifest.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries/Java
 %if ! %{gcj_support}
@@ -124,6 +126,11 @@
 
 %patch0
 
+pushd src/conf
+%{__sed} -i 's/\r//' MANIFEST.MF
+%patch1
+popd
+
 # Use javax classes, not com.sun ones
 # assume no filename contains spaces
 pushd src
@@ -225,6 +232,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1:3.0.1-1jpp.2
+- Add OSGi MANIFEST.MF information.
+
 * Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> - 1:3.0.1-1jpp.1
 - Merge with upstream and more rpmlint cleanup.