rpms/jakarta-commons-net/devel MANIFEST.MF, NONE, 1.1 jakarta-commons-net-build-xml.patch, NONE, 1.1 jakarta-commons-net.spec, 1.8, 1.9

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/extras/rpms/jakarta-commons-net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25749

Modified Files:
	jakarta-commons-net.spec 
Added Files:
	MANIFEST.MF jakarta-commons-net-build-xml.patch 
Log Message:

* Tue Jun 23 2009 Jeff Johnston <jjohnstn at redhat.com> - 0:1.4.1-5.4
- Resolves #507693
- Fix output Manifest file to be OSGi so it works with pdebuild.




--- NEW FILE MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jakarta Apache Commons Net
Bundle-SymbolicName: org.apache.commons.net
Bundle-Version: 1.4.1
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Export-Package: org.apache.commons.net;version="1.4.1",
 org.apache.commons.net.bsd;version="1.4.1",
 org.apache.commons.net.ftp;version="1.4.1",
 org.apache.commons.net.ftp.parser;version="1.4.1",
 org.apache.commons.net.io;version="1.4.1",
 org.apache.commons.net.nntp;version="1.4.1",
 org.apache.commons.net.ntp;version="1.4.1",
 org.apache.commons.net.pop3;version="1.4.1",
 org.apache.commons.net.smtp;version="1.4.1",
 org.apache.commons.net.telnet;version="1.4.1",
 org.apache.commons.net.tftp;version="1.4.1",
 org.apache.commons.net.util;version="1.4.1"
Require-Bundle: org.apache.oro;bundle-version="[2.0.8,2.1.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.2


jakarta-commons-net-build-xml.patch:

--- NEW FILE jakarta-commons-net-build-xml.patch ---
diff -up ./build.xml.fix ./build.xml
--- ./build.xml.fix	2009-06-23 14:07:58.000000000 -0400
+++ ./build.xml	2009-06-23 14:08:34.000000000 -0400
@@ -59,7 +59,8 @@
     </copy>
   </target>
   <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar">
+    <jar jarfile="${defaulttargetdir}/${final.name}.jar"
+    	 manifest="MANIFEST.MF">
 	    <fileset dir="${classesdir}">
 		    <exclude name="**/examples/**"/>
 	    </fileset>


Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- jakarta-commons-net.spec	25 Feb 2009 08:51:17 -0000	1.8
+++ jakarta-commons-net.spec	26 Jun 2009 18:35:00 -0000	1.9
@@ -43,7 +43,7 @@
 
 Name:           jakarta-commons-net
 Version:        1.4.1
-Release:        5.3%{?dist}
+Release:        5.4%{?dist}
 Epoch:          0
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
@@ -59,10 +59,12 @@ Source4:        commons-net-1.4.1-jpp-de
 # tar czf commons-build.tar.gz commons-build
 Source5:        commons-build.tar.gz
 Source6:        commons-net-1.4.1.pom
+Source7:	MANIFEST.MF
 
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{short_name}-%{version}-project_xml.patch
 Patch2:         %{short_name}-%{version}-project_properties.patch
+Patch3:         %{name}-build-xml.patch
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if ! %{without_tests}
@@ -136,9 +138,13 @@ EOT
 %setup -q -n %{short_name}-%{version}
 gzip -dc %{SOURCE5} | tar xf -
 
+cp %{SOURCE7} .
+
 %patch0 -b .sav
 %patch1 -b .sav
 %patch2 -b .sav
+%patch3
+
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -278,6 +284,10 @@ fi
 %endif
 
 %changelog
+* Tue Jun 23 2009 Jeff Johnston <jjohnstn at redhat.com> - 0:1.4.1-5.4
+- Resolves #507693
+- Fix output Manifest file to be OSGi so it works with pdebuild.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4.1-5.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild