[jakarta-commons-httpclient] Fix FTBFS.

[Alexander Kurtakov]

commit 1c9ad5dfee6e37b8f6258d70110fafa7e9f51766
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 28 12:26:35 2011 +0300

    Fix FTBFS.
    
    Adapt to current guidelines.

 jakarta-commons-httpclient-addosgimanifest.patch |    2 +-
 jakarta-commons-httpclient.spec                  |   40 ++++++++--------------
 2 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/jakarta-commons-httpclient-addosgimanifest.patch b/jakarta-commons-httpclient-addosgimanifest.patch
index 875eab2..94b41f0 100644
--- a/jakarta-commons-httpclient-addosgimanifest.patch
+++ b/jakarta-commons-httpclient-addosgimanifest.patch
@@ -1,5 +1,5 @@
 --- 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
++++ MANIFEST.MF	2007-09-06 12:30:45.000000000 -0400
 @@ -3,4 +3,27 @@
  Specification-Version: 1.0
  Implementation-Vendor: Apache Software Foundation
diff --git a/jakarta-commons-httpclient.spec b/jakarta-commons-httpclient.spec
index 0d035d9..970eda8 100644
--- a/jakarta-commons-httpclient.spec
+++ b/jakarta-commons-httpclient.spec
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        ASL 2.0
@@ -41,20 +41,16 @@ Patch0:         %{name}-disablecryptotests.patch
 # Add OSGi MANIFEST.MF bits
 Patch1:         %{name}-addosgimanifest.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
 BuildRequires:  apache-commons-codec
 BuildRequires:  apache-commons-logging >= 0:1.0.3
-BuildRequires:  jce >= 0:1.2.2
-BuildRequires:  jsse >= 0:1.0.3.01
 #BuildRequires:  java-javadoc
 BuildRequires:  apache-commons-logging-javadoc
 BuildRequires:  junit
-#BuildRequires:  jaxp = 1.3
 
 Requires:       apache-commons-logging >= 0:1.0.3
 Requires:       apache-commons-codec
@@ -84,17 +80,15 @@ for distributed communication.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Group:          Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
 
 %package        demo
 Summary:        Demos for %{name}
-Group:          Development/Testing
+Group:          Development/Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description    demo
@@ -102,7 +96,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %package        manual
 Summary:        Manual for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name}-javadoc = %{epoch}:%{version}-%{release}
 
 %description    manual
@@ -136,7 +130,7 @@ popd
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %build
-export CLASSPATH=%(build-classpath jsse jce commons-codec commons-logging junit)
+export CLASSPATH=%(build-classpath commons-codec commons-logging junit)
 ant \
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
@@ -146,14 +140,11 @@ ant \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p dist/commons-httpclient.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 # compat symlink
 pushd $RPM_BUILD_ROOT%{_javadir}
 ln -s commons-httpclient.jar commons-httpclient3.jar
@@ -161,7 +152,7 @@ popd
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # demo
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -171,28 +162,25 @@ cp -pr src/examples src/contrib $RPM_BUILD_ROOT%{_datadir}/%{name}
 rm -f dist/docs/{BUILDING,TESTING}.txt
 ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt RELEASE_NOTES.txt
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files demo
-%defattr(-,root,root,-)
 %{_datadir}/%{name}
 
 %files manual
-%defattr(-,root,root,-)
 %doc dist/docs/*
 
 
 %changelog
+* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 1:3.1-4
+- Fix FTBFS.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild