diff --git a/apache-commons-httpclient.changes b/apache-commons-httpclient.changes index ef3ee39..891d85b 100644 --- a/apache-commons-httpclient.changes +++ b/apache-commons-httpclient.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 21 15:28:32 UTC 2019 - Fridrich Strba + +- Add maven pom file and clean-up the spec file + ------------------------------------------------------------------- Tue May 15 10:34:34 UTC 2018 - fstrba@suse.com diff --git a/apache-commons-httpclient.spec b/apache-commons-httpclient.spec index 1943c74..4ac3e3d 100644 --- a/apache-commons-httpclient.spec +++ b/apache-commons-httpclient.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-httpclient # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,21 +23,23 @@ Release: 0 Summary: Feature rich package for accessing resources via HTTP License: Apache-2.0 Group: Development/Libraries/Java -Url: http://hc.apache.org/httpclient-3.x/ -Source0: http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz +URL: http://hc.apache.org/httpclient-3.x/ +Source0: http://www.apache.org/dist/httpcomponents/commons-httpclient/source/%{short_name}-%{version}-src.tar.gz +Source1: http://repo.maven.apache.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom Patch0: %{name}-disablecryptotests.patch # Add OSGi MANIFEST.MF bits Patch1: %{name}-addosgimanifest.patch Patch2: %{name}-encoding.patch #PATCH-FIX-UPSTREAM: bnc#803332 #https://issues.apache.org/jira/secure/attachment/12560251/CVE-2012-5783-2.patch -Patch3: commons-httpclient-CVE-2012-5783-2.patch +Patch3: %{short_name}-CVE-2012-5783-2.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: commons-codec BuildRequires: commons-logging >= 1.0.3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: junit Requires: commons-codec Requires: commons-logging >= 1.0.3 @@ -46,7 +48,6 @@ Provides: jakarta-%{short_name} = %{version} Obsoletes: jakarta-%{short_name} < %{version} Provides: jakarta-%{short_name}3 = %{version} Obsoletes: jakarta-%{short_name}3 < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -64,22 +65,22 @@ service clients, or systems that leverage or extend the HTTP protocol for distributed communication. %package javadoc -Summary: Developer documentation for apache-commons-httpclient +Summary: Developer documentation for %{name} Group: Development/Libraries/Java %description javadoc -Developer documentation for apache-commons-httpclient in JavaDoc +Developer documentation for %{name} in JavaDoc format. %{summary}. %package demo -Summary: Demonstration files for apache-commons-httpclient +Summary: Demonstration files for %{name} Group: Development/Libraries/Java Requires: %{name} = %{version} %description demo -Demonstration files for apache-commons-httpclient. NOTE: It is +Demonstration files for %{name}. NOTE: It is possible that some demonstration files are specially prepared for SUN Java runtime environment. If they fail with IBM or BEA Java, the package itself does not need to be broken. @@ -87,16 +88,16 @@ package itself does not need to be broken. %{summary}. %package manual -Summary: Manual for apache-commons-httpclient +Summary: Manual for %{name} Group: Development/Libraries/Java %description manual -Manual for apache-commons-httpclient +Manual for %{name} %{summary}. %prep -%setup -q -n commons-httpclient-%{version} +%setup -q -n %{short_name}-%{version} mkdir lib # duh rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej @@ -138,17 +139,22 @@ ant \ %install # jars mkdir -p %{buildroot}%{_javadir} -cp -p dist/commons-httpclient.jar \ +cp -p dist/%{short_name}.jar \ %{buildroot}%{_javadir}/%{name}.jar # compat symlink pushd %{buildroot}%{_javadir} -ln -s apache-commons-httpclient.jar apache-commons-httpclient3.jar -ln -s apache-commons-httpclient.jar commons-httpclient3.jar -ln -s apache-commons-httpclient.jar commons-httpclient.jar -ln -s apache-commons-httpclient.jar jakarta-commons-httpclient.jar -ln -s apache-commons-httpclient.jar jakarta-commons-httpclient3.jar +ln -s %{name}.jar %{name}3.jar +ln -s %{name}.jar %{short_name}3.jar +ln -s %{name}.jar %{short_name}.jar +ln -s %{name}.jar jakarta-%{short_name}.jar +ln -s %{name}.jar jakarta-%{short_name}3.jar popd +# pom +mkdir -p %{buildroot}%{_mavenpomdir} +cp -p %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a apache:commons-httpclient + # javadoc mkdir -p %{buildroot}%{_javadocdir} mv dist/docs/api %{buildroot}%{_javadocdir}/%{name} @@ -166,13 +172,20 @@ ln -s %{_javadocdir}/%{name} dist/docs/apidocs %files %defattr(0644,root,root,0755) -%doc LICENSE.txt README.txt RELEASE_NOTES.txt +%license LICENSE.txt +%doc README.txt RELEASE_NOTES.txt %{_javadir}/%{name}.jar -%{_javadir}/apache-commons-httpclient3.jar -%{_javadir}/commons-httpclient3.jar -%{_javadir}/commons-httpclient.jar -%{_javadir}/jakarta-commons-httpclient3.jar -%{_javadir}/jakarta-commons-httpclient.jar +%{_javadir}/%{name}3.jar +%{_javadir}/%{short_name}3.jar +%{_javadir}/%{short_name}.jar +%{_javadir}/jakarta-%{short_name}3.jar +%{_javadir}/jakarta-%{short_name}.jar +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files javadoc %defattr(0644,root,root,0755) diff --git a/commons-httpclient-3.1.pom b/commons-httpclient-3.1.pom new file mode 100644 index 0000000..8cabc03 --- /dev/null +++ b/commons-httpclient-3.1.pom @@ -0,0 +1,254 @@ + + 4.0.0 + commons-httpclient + commons-httpclient + HttpClient + 3.1 + The HttpClient component supports the client-side of RFC 1945 (HTTP/1.0) and RFC 2616 (HTTP/1.1) , several related specifications (RFC 2109 (Cookies) , RFC 2617 (HTTP Authentication) , etc.), and provides a framework by which new request types (methods) or HTTP extensions can be created easily. + http://jakarta.apache.org/httpcomponents/httpclient-3.x/ + + http://issues.apache.org/jira/browse/HTTPCLIENT + + + + + +
httpcomponents-dev@jakarta.apache.org
+ + + + + 2001 + + + HttpComponents Developer List + httpcomponents-dev-subscribe@jakarta.apache.org + httpcomponents-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-httpcomponents-dev/ + + + HttpClient User List + httpclient-user-subscribe@jakarta.apache.org + httpclient-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-httpclient-user/ + + + + + mbecke + Michael Becke + mbecke -at- apache.org + + + Release Prime + Java Developer + + + + jsdever + Jeff Dever + jsdever -at- apache.org + Independent consultant + + 2.0 Release Prime + Java Developer + + + + dion + dIon Gillard + dion -at- apache.org + Multitask Consulting + + Java Developer + + + + oglueck + Ortwin Glueck + oglueck -at- apache.org + http://www.odi.ch/ + + + Java Developer + + + + jericho + Sung-Gu + jericho -at- apache.org + + + Java Developer + + + + olegk + Oleg Kalnichevski + olegk -at- apache.org + + Java Developer + + + + sullis + Sean C. Sullivan + sullis -at- apache.org + Independent consultant + + Java Developer + + + + adrian + Adrian Sutton + adrian.sutton -at- ephox.com + Intencha + + Java Developer + + + + rwaldhoff + Rodney Waldhoff + rwaldhoff -at- apache + Britannica + + Java Developer + + + + + + Armando Anton + armando.anton -at- newknow.com + + + Sebastian Bazley + sebb -at- apache.org + + + Ola Berg + + + + Sam Berlin + sberlin -at- limepeer.com + + + Mike Bowler + + + + Samit Jain + jain.samit -at- gmail.com + + + Eric Johnson + eric -at- tibco.com + + + Christian Kohlschuetter + ck -at- newsclub.de + + + Ryan Lubke + Ryan.Lubke -at- Sun.COM + + + Sam Maloney + sam.maloney -at- filogix.com + + + Rob Di Marco + rdimarco -at- hmsonline.com + + + Juergen Pill + Juergen.Pill -at- softwareag.com + + + Mohammad Rezaei + mohammad.rezaei -at- gs.com + + + Roland Weber + rolandw -at- apache.org + + + Laura Werner + laura -at- lwerner.org + + + Mikael Wilstrom + mikael.wikstrom -at- it.su.se + + + + + Apache License + http://www.apache.org/licenses/LICENSE-2.0 + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/httpcomponents/oac.hc3x/trunk + http://svn.apache.org/repos/asf/jakarta/httpcomponents/oac.hc3x/trunk + + + Apache Software Foundation + http://jakarta.apache.org/ + + + src/java + src/test + + + src/resources + + + + + src/test + + **/*.keystore + + + + + + maven-surefire-plugin + + + **/TestAll.java + + + + + + + + junit + junit + 3.8.1 + test + + + commons-logging + commons-logging + 1.0.4 + + + commons-codec + commons-codec + 1.2 + + + + + default + Default Site + scp://people.apache.org//www/jakarta.apache.org/httpcomponents/httpclient-3.x/ + + converted + + \ No newline at end of file