9:32 a.m.
commit f691e8f3b3fa85c48a4bb76a94c2142178e04c01
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Feb 25 14:42:15 2011 +0100
Update to latest upstream
.gitignore | 1 +
0001-Remove-test-dependencies.patch | 42 +++++++++-------------------------
async-http-client.spec | 27 ++++++++++------------
sources | 2 +-
4 files changed, 25 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b71727d..9d0cd0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/AsyncHttpClient-async-http-client-async-http-client-1.4.1-0-g5ce359e.tar.gz
+/async-http-client-1.6.1.tar.bz2
diff --git a/0001-Remove-test-dependencies.patch b/0001-Remove-test-dependencies.patch
index 9147405..8ec34e4 100644
--- a/0001-Remove-test-dependencies.patch
+++ b/0001-Remove-test-dependencies.patch
@@ -1,18 +1,18 @@
-From d868287aa574cbb64d1dcdc159e470b984ae379f Mon Sep 17 00:00:00 2001
+From c3bf4ea88ef38c1875c0558975a628e9af52fbcb Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Mon, 17 Jan 2011 12:53:27 +0100
+Date: Fri, 25 Feb 2011 14:36:38 +0100
Subject: [PATCH] Remove test dependencies
-these are missing in fedora repos for now
+some of these are missing in fedora repos for now
---
- pom.xml | 76 ---------------------------------------------------------------
- 1 files changed, 0 insertions(+), 76 deletions(-)
+ pom.xml | 63 ---------------------------------------------------------------
+ 1 files changed, 0 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 4c7bbed..5e6234b 100644
+index 50377b9..31c050a 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -80,68 +80,6 @@
+@@ -75,69 +75,6 @@
<version>1.6.1</version>
</dependency>
@@ -21,7 +21,7 @@ index 4c7bbed..5e6234b 100644
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>0.9.26</version>
-- <scope>test</scope>
+- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
@@ -78,30 +78,10 @@ index 4c7bbed..5e6234b 100644
- </exclusion>
- </exclusions>
- </dependency>
-
+-
<!-- Optional Apache Http Client -->
<dependency>
-@@ -163,20 +101,6 @@
- <optional>true</optional>
- </dependency>
-
-- <dependency>
-- <groupId>org.sonatype.http-testing-harness</groupId>
-- <artifactId>testng-runner</artifactId>
-- <version>0.3</version>
-- <type>jar</type>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.sonatype.http-testing-harness</groupId>
-- <artifactId>server-provider</artifactId>
-- <version>0.3</version>
-- <type>jar</type>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
+ <groupId>commons-httpclient</groupId>
--
-1.7.3.4
+1.7.4
diff --git a/async-http-client.spec b/async-http-client.spec
index 4f40ab6..021aad1 100644
--- a/async-http-client.spec
+++ b/async-http-client.spec
@@ -1,20 +1,15 @@
-%global githash 5ce359e
-%global dirhash a691a35
-Name: async-http-client
-Version: 1.4.1
-
-Release: 3%{?dist}
+Name: async-http-client
+Version: 1.6.1
+Release: 1%{?dist}
Summary: Asynchronous Http Client for Java
Group: Development/Libraries
License: ASL 2.0
URL: https://github.com/AsyncHttpClient/%{name}
-# it seems github has redirects plus it generates tarball on the fly
-# to get tarball go to
https://github.com/AsyncHttpClient/async-http-client/archives/async-http-...
-# click "downloads" in upper right corner
-# click "download .tar.gz"
-Source0: AsyncHttpClient-%{name}-%{name}-%{version}-0-g%{githash}.tar.gz
+# git clone https://github.com/AsyncHttpClient/async-http-client.git
+# git archive --prefix="async-http-client-1.6.1/" --format=tar
async-http-client-1.6.1 | bzip2 > async-http-client-1.6.1.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Patch0: 0001-Remove-test-dependencies.patch
@@ -55,14 +50,13 @@ Requires: jpackage-utils
%{summary}.
%prep
-# last part will have to change every time
-%setup -q -n AsyncHttpClient-%{name}-%{dirhash}
+%setup -q
%patch0 -p1
%build
# we don't have all test dependencies available so disable tests
-mvn-local -e \
+mvn-rpmbuild -e \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -89,7 +83,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
-%doc README changelog.html LICENSE-2.0.txt
+%doc README LICENSE-2.0.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
@@ -102,6 +96,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6.1-1
+- Update to latest upstream
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 3bef80e..749d972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86ec6d2bd9211cb50cfed40ae40810fe
AsyncHttpClient-async-http-client-async-http-client-1.4.1-0-g5ce359e.tar.gz
+55504c3167fcbe1ca3956631dea6334d async-http-client-1.6.1.tar.bz2