[plexus-containers] Remove unneeded env var definitions
by Stanislav Ochotnicky
commit 6f03c709092cd7932c32748b3ca7f6802ba704ca
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Feb 28 16:17:58 2011 +0100
Remove unneeded env var definitions
plexus-containers.spec | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/plexus-containers.spec b/plexus-containers.spec
index e8ec080..b6f9a64 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -10,7 +10,7 @@
Name: %{parent}-%{subname}
Version: 1.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and Plexus
Group: Development/Libraries
@@ -30,7 +30,7 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.3
%if %{with_maven}
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
@@ -140,23 +140,15 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
%if %{with_maven}
- mvn-rpmbuild \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- install
+ mvn-rpmbuild -Dmaven.test.skip=true install
# for integration tests ran during javadoc:javadoc
for file in $MAVEN_REPO_LOCAL/org/apache/maven/plugins/maven-javadoc-plugin/%{javadoc_plugin_version}/*;do
sha1sum $file | awk '{print $1}' > $ile.sha1
done
- mvn-rpmbuild \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- javadoc:aggregate
+ mvn-rpmbuild javadoc:aggregate
%else
export OPT_JAR_LIST="ant/ant-junit junit"
pushd plexus-component-annotations
@@ -268,6 +260,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5.5-2
+- Remove unneeded env var definitions
+
* Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5.5-1
- Update to latest upstream
- Remove obsolete patches
13 years, 1 month
[plexus-utils] Update to 2.0.6
by Stanislav Ochotnicky
commit c4b2e36281b669cd42718fca17611817f6faf87b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Feb 28 15:42:21 2011 +0100
Update to 2.0.6
- Remove obsolete patches
- Use maven 3 to build
.gitignore | 1 +
plexus-utils-remove-release-plugin.patch | 16 ----------------
plexus-utils.spec | 27 +++++++++++++--------------
sources | 2 +-
4 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ce15345
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/plexus-utils-2.0.6.tar.bz2
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 7dcf1bb..5b82984 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -28,19 +28,19 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define parent plexus
-%define subname utils
+%global parent plexus
+%global subname utils
Name: plexus-utils
-Version: 2.0.5
-Release: 3%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT
Group: Development/Libraries
URL: http://plexus.codehaus.org/
-Source0: plexus-utils-%{version}.tar.gz
-# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.1/
-Patch0: plexus-utils-remove-release-plugin.patch
+# git clone git://github.com/sonatype/sisu
+# git archive --prefix="plexus-utils-2.0.6/" --format=tar plexus-utils-2.0.6 | bzip2 > plexus-utils-2.0.6.tar.bz2
+Source0: plexus-utils-%{version}.tar.bz2
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
@@ -79,15 +79,9 @@ Javadoc for %{name}.
%prep
%setup -q
-%patch0 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
# jars
@@ -129,6 +123,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0.6-1
+- Update to 2.0.6
+- Remove obsolete patches
+- Use maven 3 to build
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index ebc9282..c2e14d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58d8df8781da14817dde8dd548a15e2e plexus-utils-2.0.5.tar.gz
+ccf88aa71e17bbf6c15b69d6277a13a8 plexus-utils-2.0.6.tar.bz2
13 years, 1 month
[Bug 675389] New: apache-commons-configuration does not rebuild
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: apache-commons-configuration does not rebuild
https://bugzilla.redhat.com/show_bug.cgi?id=675389
Summary: apache-commons-configuration does not rebuild
Product: Fedora
Version: 14
Platform: x86_64
OS/Version: Linux
Status: NEW
Severity: low
Priority: unspecified
Component: apache-commons-configuration
AssignedTo: sochotni(a)redhat.com
ReportedBy: pampelmuse(a)gmx.at
QAContact: extras-qa(a)fedoraproject.org
CC: fnasser(a)redhat.com, chris.spike(a)arcor.de,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Created attachment 477179
--> https://bugzilla.redhat.com/attachment.cgi?id=477179
log file of rebuild
Description of problem:
apache-commons-configuration does not rebuild.
Maybe due to missing ant.jar
Version-Release number of selected component (if applicable):
apache-commons-configuration-1.6-2.fc14.src.rpm
How reproducible:
always
Steps to Reproduce:
1. mock -r ck --rebuild apache-commons-configuration-1.6-2.fc14.src.rpm
OR
1. rpm -i apache-commons-configuration-1.6-2.fc14.src.rpm
2. rpmbuild -bb rpmbuild/SPECS/apache-commons-configuration.spec
Actual results:
see log file
Expected results:
clean rebuild
Additional info:
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 1 month
[objenesis] Initial import (#590681).
by Guido Grazioli
commit 77cba8c42be09283e34f8d85b15b2314001af320
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Sat Feb 26 23:01:44 2011 +0100
Initial import (#590681).
.gitignore | 1 +
001-objenesis-fix-build.patch | 116 ++++++++++++++++++++++
objenesis.spec | 215 +++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 333 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f922a35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/objenesis-1.2.tar.xz
diff --git a/001-objenesis-fix-build.patch b/001-objenesis-fix-build.patch
new file mode 100644
index 0000000..c235271
--- /dev/null
+++ b/001-objenesis-fix-build.patch
@@ -0,0 +1,116 @@
+--- A/main/pom.xml 2009-08-27 00:15:13.000000000 +0200
++++ B/main/pom.xml 2010-05-10 14:44:07.634785201 +0200
+@@ -38,7 +38,7 @@
+ <artifactId>maven-timestamp-plugin</artifactId>
+ </plugin>
+ <plugin>
+- <groupId>com.google.code.maven-license-plugin</groupId>
++ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ </plugin>
+ <plugin>
+--- A/pom.xml 2009-08-26 23:12:00.000000000 +0200
++++ B/pom.xml 2010-05-10 14:44:07.635789574 +0200
+@@ -203,9 +203,9 @@
+ </executions>
+ </plugin>
+ <plugin>
+- <groupId>com.google.code.maven-license-plugin</groupId>
++ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+- <version>1.4.0</version>
++ <version>1.6.1</version>
+ <configuration>
+ <header>${basedir}/../header.txt</header>
+ <excludes>
+@@ -291,7 +291,7 @@
+ <pluginManagement>
+ <plugins>
+ <plugin>
+- <groupId>com.google.code.maven-license-plugin</groupId>
++ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <executions>
+ <execution>
+--- A/tck/pom.xml 2009-08-26 23:27:20.000000000 +0200
++++ B/tck/pom.xml 2010-05-10 14:52:36.424792684 +0200
+@@ -34,70 +34,6 @@
+ <version>${project.version}</version>
+ </dependency>
+
+- <!-- Dependencies below are for the OSGi test -->
+-
+- <dependency>
+- <groupId>org.springframework.osgi</groupId>
+- <artifactId>spring-osgi-test</artifactId>
+- <version>1.2.0</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.springframework.osgi</groupId>
+- <artifactId>spring-osgi-annotation</artifactId>
+- <version>1.2.0</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.springframework.osgi</groupId>
+- <artifactId>spring-osgi-extender</artifactId>
+- <version>1.2.0</version>
+- <scope>test</scope>
+- </dependency>
+-
+- <!-- These are just to have a nice logging -->
+- <dependency>
+- <groupId>org.slf4j</groupId>
+- <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+- <version>1.5.0</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.slf4j</groupId>
+- <artifactId>com.springsource.slf4j.api</artifactId>
+- <version>1.5.0</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.slf4j</groupId>
+- <artifactId>com.springsource.slf4j.log4j</artifactId>
+- <version>1.5.0</version>
+- <scope>test</scope>
+- <exclusions>
+- <exclusion>
+- <artifactId>log4j</artifactId>
+- <groupId>log4j</groupId>
+- </exclusion>
+- <exclusion>
+- <artifactId>com.springsource.org.apache.log4j</artifactId>
+- <groupId>org.apache.log4j</groupId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+- <groupId>org.springframework.osgi</groupId>
+- <artifactId>log4j.osgi</artifactId>
+- <version>1.2.15-SNAPSHOT</version>
+- <scope>test</scope>
+- </dependency>
+-
+- <!-- And this is our Equinox implementation -->
+- <dependency>
+- <groupId>org.eclipse.osgi</groupId>
+- <artifactId>org.eclipse.osgi</artifactId>
+- <version>3.2.2</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
+@@ -107,7 +43,7 @@
+ <artifactId>maven-timestamp-plugin</artifactId>
+ </plugin>
+ <plugin>
+- <groupId>com.google.code.maven-license-plugin</groupId>
++ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ </plugin>
+ <plugin>
diff --git a/objenesis.spec b/objenesis.spec
new file mode 100644
index 0000000..9583bc3
--- /dev/null
+++ b/objenesis.spec
@@ -0,0 +1,215 @@
+# Copyright (c) 2000-2009, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+Summary: A library for instantiating Java objects
+Name: objenesis
+Version: 1.2
+Release: 6%{dist}
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://objenesis.googlecode.com/svn/docs/index.html
+# svn export http://objenesis.googlecode.com/svn/tags/1_2/ objenesis-1.2
+# tar cfJ objenesis-1.2.tar.xz objenesis-1.2
+Source0: %{name}-%{version}.tar.xz
+
+# Skipping website (requires xsite), this patch is unused atm
+#Patch0: objenesis-website-pom.patch
+
+# Remove deps for test scope (unavailable); fix
+# maven-license-plugin groupID to latest version available.
+Patch1: 001-objenesis-fix-build.patch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: junit
+BuildRequires: maven
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-eclipse-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-shade-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-license-plugin
+BuildRequires: maven-timestamp-plugin
+BuildRequires: xpp3-minimal
+BuildRequires: asm2
+
+Requires: java
+BuildRequires: jpackage-utils
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+BuildArch: noarch
+
+%description
+Java supports dynamic instantiation of classes using Class.newInstance().
+However, this only works if the class has an appropriate constructor. There
+are many times when a class cannot be instantiated this way, such as when
+the class contains:
+* Constructors that require arguments.
+* Constructors that have side effects.
+* Constructors that throw exceptions.
+As a result, it is common to see restrictions in libraries stating that
+classes must require a default constructor. Objenesis aims to overcome these
+restrictions by bypassing the constructor on object instantiation.
+Needing to instantiate an object without calling the constructor is a fairly
+specialized task, however there are certain cases when this is useful:
+* Serialization, Remoting and Persistence - Objects need to be instantiated
+ and restored to a specific state, without invoking code.
+* Proxies, AOP Libraries and Mock Objects - Classes can be subclassed without
+ needing to worry about the super() constructor.
+* Container Frameworks - Objects can be dynamically instantiated in
+ non-standard ways.
+
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+# Skipped till xsite avilable in fedora
+#%%package manual
+#Group: Documentation
+#Summary: Documents for %%{name}
+#
+#%%description manual
+#This package contains the %%{name} manual.
+
+
+%prep
+%setup -q
+#%%patch0 -b .sav0
+%patch1 -p1
+
+
+%build
+# tests are skipped because of missing dependency spring-osgi-test
+mvn-rpmbuild -e \
+ -Dyear=2009 \
+ -Dmaven.test.skip=true \
+ install javadoc:javadoc
+
+# Below is for manual (requires xsite), skipped
+#pushd website
+#mvn-jpp -e \
+# -s ${M2SETTINGS} \
+# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+# -Dmaven2.jpp.depmap.file=%%{SOURCE1} \
+# antrun:run
+#popd
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -Dp -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
+%add_to_maven_depmap org.objenesis objenesis-parent %{version} JPP %{name}-parent
+
+install -Dp -m 644 main/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dp -m 644 main/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.objenesis objenesis %{version} JPP %{name}
+
+install -Dp -m 644 tck/target/%{name}-tck-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tck.jar
+install -Dp -m 644 tck/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-tck.pom
+%add_to_maven_depmap org.objenesis objenesis-tck %{version} JPP %{name}-tck
+
+# javadoc
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main
+cp -pr main/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
+cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt
+%{_javadir}/*.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
+
+%changelog
+* Thu Feb 24 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-6
+- Build with mvn-rpmbuild
+- Fix License
+- Comment on skipped tests
+
+* Fri Feb 04 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-5
+- Build with maven 3
+
+* Sun Jan 23 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-4
+- Drop buildroot and %%clean section
+- Drop use of maven2-settings.xml and jpp-depmap.xml
+- Install unversioned jars
+- Clean up of needed patch and mvn-jpp execution
+
+* Tue Jan 18 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-3
+- Fix build in rawhide
+
+* Sat Dec 04 2010 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-2
+- Fix build in rawhide
+- Update to new Java Packaging Guidelines
+
+* Mon May 10 2010 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-1
+- Update to 1.2
+
+* Thu May 06 2010 Guido Grazioli <guido.grazioli(a)gmail.com> 1.0-1
+- Import from JPackage
+
+* Fri Feb 27 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0-2.jpp5
+- BR xpp3-minimal and fix depmap accordingly
+- Disown poms and fragments dirs
+
+* Wed Jun 18 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-1.jpp5
+- First release
diff --git a/sources b/sources
index e69de29..f7f087c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+1bb12f3849fa1225bfab7106c716c34d objenesis-1.2.tar.xz
13 years, 1 month
[httpcomponents-client] Build httpmime module.
by Alexander Kurtakov
commit 913b07b5ca7f3f779ccadcb4fce8b09719f9dfda
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 25 20:29:58 2011 +0200
Build httpmime module.
0001-Cleanup-pom.patch | 146 ++++++++++++++++++++++++++-----------------
httpcomponents-client.spec | 30 +++++----
2 files changed, 105 insertions(+), 71 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index d4ba8e6..ac7b967 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,6 +1,84 @@
+--- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
++++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
+@@ -38,7 +38,7 @@
+ HttpComponents Client (base module)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -71,12 +71,6 @@
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>${easymock.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -122,25 +116,12 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -165,14 +146,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.5</jdk>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
-+++ pom.xml 2011-02-17 22:03:40.828341546 +0200
-@@ -88,21 +88,6 @@
++++ pom.xml 2011-02-25 20:17:20.519335750 +0200
+@@ -81,28 +81,11 @@
+ <modules>
+ <module>httpclient</module>
+ <module>httpmime</module>
+- <module>httpclient-cache</module>
+- <module>httpclient-osgi</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -22,7 +100,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-@@ -189,49 +174,6 @@
+@@ -189,49 +172,6 @@
</configuration>
</plugin>
<plugin>
@@ -72,7 +150,7 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
-@@ -252,14 +194,7 @@
+@@ -252,14 +192,7 @@
</execution>
</executions>
</plugin>
@@ -88,7 +166,7 @@
</build>
<reporting>
-@@ -280,15 +215,7 @@
+@@ -280,15 +213,7 @@
</reportSets>
</plugin>
@@ -105,10 +183,10 @@
</reporting>
</project>
---- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
-+++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
+--- httpmime/pom.xml.sav 2011-01-17 22:00:44.000000000 +0200
++++ httpmime/pom.xml 2011-02-25 20:19:09.191564653 +0200
@@ -38,7 +38,7 @@
- HttpComponents Client (base module)
+ HttpComponents HttpClient - MIME coded entities
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
@@ -116,63 +194,15 @@
<dependencies>
<dependency>
-@@ -71,12 +71,6 @@
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymockclassextension</artifactId>
-- <version>${easymock.version}</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
-
- <properties>
-@@ -122,25 +116,12 @@
+@@ -112,6 +112,11 @@
</execution>
</executions>
</plugin>
-- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <flushPolicy>threaded</flushPolicy>
-- <flushInterval>100</flushInterval>
-- <targetPercentage>50%</targetPercentage>
-- </configuration>
-- <executions>
-- <execution>
-- <id>site</id>
-- <phase>pre-site</phase>
-- <goals>
-- <goal>instrument</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- </plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
-+ </plugins>
+ </plugins>
</build>
- <reporting>
-@@ -165,14 +146,6 @@
- </plugin>
-
- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <jdk>1.5</jdk>
-- </configuration>
-- </plugin>
--
-- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 7ab4896..b2bf294 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -15,10 +15,12 @@ BuildArch: noarch
BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core
+BuildRequires: apache-mime4j
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: httpcomponents-core
+Requires: apache-mime4j
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -45,26 +47,25 @@ API docs for %{name}.
%patch0 -b .sav
%build
-# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j
-pushd httpclient
-
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
-popd
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
-cd httpclient
# jars
-install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar
+install -D -m 0644 httpclient/target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar
+install -D -m 0644 httpmime/target/httpmime-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpmime.jar
-# pom
+# main pom
install -D -m 0644 pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
+%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client
+# pom
+install -D -m 0644 httpclient/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name} httpclient
+install -D -m 0644 httpmime/pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpmime.pom
+%add_to_maven_depmap org.apache.httpcomponents httpmime %{version} JPP/%{base_name} httpmime
-# main pom
-install -D -m 0644 ../pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
-%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -91,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4
+- Build httpmime module.
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3
- Don't use basename as an identifier.
13 years, 1 month
[async-http-client] Update to latest upstream
by Stanislav Ochotnicky
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
13 years, 1 month