commit ba47e371ad85572c12e54fa034cb931f6b60b1c3 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Mon Aug 6 09:21:33 2012 +0200
Update to upstream version 6
.gitignore | 1 + 0001-Clean-pom.patch | 60 ------------------------------------------- httpcomponents-project.spec | 53 ++++++++++++------------------------- sources | 2 +- 4 files changed, 19 insertions(+), 97 deletions(-) --- diff --git a/.gitignore b/.gitignore index 41c50eb..b7d99d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /httpcomponents-project-4.1.1.tar.xz +/httpcomponents-project-6.tar.xz diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 8a2dd32..7cda56f 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,46 +1,26 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents -Version: 4.1.1 -Release: 5%{?dist} +Version: 6 +Release: 1%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ -# svn export -r 1050387 http://svn.apache.org/repos/asf/httpcomponents/project httpcomponents-project-4.1.1 -# tar cJvf httpcomponents-project-4.1.1.tar.xz httpcomponents-project-4.1.1 -Source0: httpcomponents-project-%{version}.tar.xz -Patch0: 0001-Clean-pom.patch +# svn export http://svn.apache.org/repos/asf/httpcomponents/project/tags/%%7Bversion%7D %{name}-%{version} +# tar cJf %{name}-%{version}.tar.xz %{name}-%{version} +Source: %{name}-%{version}.tar.xz BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils
# Requires are dependencies from pom.xml. This project should only be required for building with maven. Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires: maven -Requires: maven-antrun-plugin -Requires: maven-assembly-plugin -Requires: maven-clean-plugin Requires: maven-compiler-plugin -Requires: maven-deploy-plugin Requires: maven-gpg-plugin -Requires: maven-install-plugin Requires: maven-jar-plugin -Requires: maven-javadoc-plugin -Requires: maven-plugin-jxr Requires: maven-project-info-reports-plugin -Requires: maven-release-plugin -Requires: maven-resources-plugin Requires: maven-site-plugin -Requires: maven-source-plugin -Requires: maven-surefire-plugin -Requires: maven-surefire-report-plugin -Requires: maven-release-plugin -Requires: maven-plugin-jxr -Requires: maven-plugin-bundle - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils
%description Common Maven POM file for HttpComponents. This project should be @@ -49,25 +29,26 @@ use it as runtime requirement.
%prep %setup -q -%patch0 -p1 +%pom_remove_plugin :buildnumber-maven-plugin +%pom_remove_plugin :clirr-maven-plugin +%pom_remove_plugin :docbkx-maven-plugin +%pom_remove_plugin :maven-clover2-plugin +%pom_remove_plugin :maven-notice-plugin
%install -%{__install} -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.httpcomponents-project.pom -%add_to_maven_depmap org.apache.httpcomponents project %{version} JPP/httpcomponents project - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -dm 755 %{buildroot}/%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom +%add_maven_depmap JPP.%{name}.pom
%files -%defattr(-,root,root,-) -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %{_mavendepmapfragdir}/%{name} %{_mavenpomdir}/JPP.%{name}.pom
%changelog +* Mon Aug 6 2012 Mikolaj Izdebski mizdebsk@redhat.com - 6-1 +- Update to upstream version 6 + * Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources index ba13a38..214d113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ae37b64ca1149013a5d8e34b0efa07e httpcomponents-project-4.1.1.tar.xz +3b9f2c3521ea8a51fc2481dbf43e9869 httpcomponents-project-6.tar.xz
java-sig-commits@lists.fedoraproject.org