[classpathx-mail] Fix inetlib inclusion in the monolithic jar.

[Alexander Kurtakov]

commit b8620032e3c596e9d0231c0e43fdf39ea9d9d6b0
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jan 24 09:38:34 2011 +0200

    Fix inetlib inclusion in the monolithic jar.
    
    Drop unneeded patches.

 classpathx-mail-add-inetlib.patch |   14 +++++++-------
 classpathx-mail-docbuild.patch    |   12 ------------
 classpathx-mail.spec              |    2 ++
 3 files changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/classpathx-mail-add-inetlib.patch b/classpathx-mail-add-inetlib.patch
index 4cc6983..7e43518 100644
--- a/classpathx-mail-add-inetlib.patch
+++ b/classpathx-mail-add-inetlib.patch
@@ -4,13 +4,13 @@
          <include name='javamail.providers'/>
          <include name='javamail.address.map'/>
        </metainf>
-+      <include name='org/jpackage/mail/inet/ftp/*.class'/>
-+      <include name='org/jpackage/mail/inet/util/*.class'/>
-+      <include name='org/jpackage/mail/inet/smtp/*.class'/>
-+      <include name='org/jpackage/mail/inet/imap/*.class'/>
-+      <include name='org/jpackage/mail/inet/pop3/*.class'/>
-+      <include name='org/jpackage/mail/inet/nntp/*.class'/>
-+      <include name='org/jpackage/mail/inet/gopher/*.class'/>
++      <include name='gnu/inet/ftp/*.class'/>
++      <include name='gnu/inet/util/*.class'/>
++      <include name='gnu/inet/smtp/*.class'/>
++      <include name='gnu/inet/imap/*.class'/>
++      <include name='gnu/inet/pop3/*.class'/>
++      <include name='gnu/inet/nntp/*.class'/>
++      <include name='gnu/inet/gopher/*.class'/>
        <include name='gnu/mail/treeutil/*.class'/>
        <include name='gnu/mail/providers/*.class'/>
        <include name='gnu/mail/providers/smtp/*.class' unless='disable-smtp'/>
diff --git a/classpathx-mail.spec b/classpathx-mail.spec
index 02560d5..4881b97 100644
--- a/classpathx-mail.spec
+++ b/classpathx-mail.spec
@@ -43,6 +43,7 @@ License:        GPLv2+ with exceptions
 URL:            http://www.gnu.org/software/classpathx/
 Source0:        http://ftp.gnu.org/gnu/classpathx/mail-%{version}.tar.gz
 Source1:        http://ftp.gnu.org/gnu/classpath/inetlib-%{inetlibver}.tar.gz
+Patch0:         %{name}-add-inetlib.patch
 # see bz157685
 Patch3:         %{name}-remove-inetlib.patch
 
@@ -70,6 +71,7 @@ Requires:       jpackage-utils
 
 %prep
 %setup -q -n mail-%{version}
+%patch0
 %patch3 -p0
 rm -f libmail.so
 gzip -dc %{SOURCE1} | tar -xf -