[Jpackage-commits] dist/hc-httpcore/devel hc-httpcore-no-clover.patch, NONE, 1.1 hc-httpcore.spec, 1.12, 1.13

David Walluck david at ryu.zarb.org
Thu Dec 9 08:37:29 CET 2010


Update of /home/projects/jpackage/cvs/dist/hc-httpcore/devel
In directory ryu.zarb.org:/tmp/cvs-serv24657

Modified Files:
	hc-httpcore.spec 
Added Files:
	hc-httpcore-no-clover.patch 
Log Message:
- fix build

Index: hc-httpcore.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hc-httpcore/devel/hc-httpcore.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** hc-httpcore.spec	8 Dec 2010 18:32:34 -0000	1.12
--- hc-httpcore.spec	9 Dec 2010 07:37:27 -0000	1.13
***************
*** 35,39 ****
  Name:           hc-httpcore
  Version:        4.1
! Release:        0.1%{?dist}
  Epoch:          0
  Summary:        HTTPCore components
--- 35,39 ----
  Name:           hc-httpcore
  Version:        4.1
! Release:        1.1%{?dist}
  Epoch:          0
  Summary:        HTTPCore components
***************
*** 46,50 ****
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
! Patch0:         hc-httpcore-resources-plugin.patch
  Provides:       jakarta-httpcore = %{epoch}:%{version}-%{release}
  Obsoletes:      jakarta-httpcore < %{epoch}:%{version}-%{release}
--- 46,50 ----
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
! Patch0:         hc-httpcore-no-clover.patch
  Provides:       jakarta-httpcore = %{epoch}:%{version}-%{release}
  Obsoletes:      jakarta-httpcore < %{epoch}:%{version}-%{release}
***************
*** 58,63 ****
--- 58,65 ----
  BuildRequires:  docbkx
  #BuildRequires:  docbook-xml >= 0:4.4
+ BuildRequires:  felix-maven2
  BuildRequires:  hc-project >= 0:4.1.1
  BuildRequires:  junit >= 0:3.8.2
+ BuildRequires:  junit4
  BuildRequires:  maven2 >= 2.0.7
  BuildRequires:  maven2-plugin-antrun
***************
*** 71,77 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven-release
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 73,81 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
+ BuildRequires:  maven2-plugin-source
  BuildRequires:  maven-release
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit4
! BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
***************
*** 111,148 ****
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Daggregate=true \
!         install javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/httpcomponents
! install -p -m 644 module-main/target/%{sname}-%{namedversion}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/httpcomponents/%{sname}-%{version}.jar
! install -p -m 644 module-nio/target/%{sname}-nio-%{namedversion}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/httpcomponents/%{sname}-nio-%{version}.jar
! #install -p -m 644 module-osgi-bundle/target/org.apache.httpcomponents.httpcore_%{version}.jar \
! #               $RPM_BUILD_ROOT%{_javadir}/httpcomponents/
! (cd $RPM_BUILD_ROOT%{_javadir}/httpcomponents && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && ln -s httpcomponents/httpcore.jar jakarta-httpcore.jar && ln -s httpcomponents/httpcore-nio.jar jakarta-httpcore-nio.jar)
! (cd $RPM_BUILD_ROOT%{_javadir}/httpcomponents && ln -s httpcore-nio.jar httpcore-niossl.jar)
  
  # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcomponents-core %{namedversion} JPP/httpcomponents core
! install -p -m 644 module-main/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore %{namedversion} JPP/httpcomponents httpcore
! install -p -m 644 module-nio/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-nio %{namedversion} JPP/httpcomponents httpcore-nio
! install -p -m 644 module-nio/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-niossl %{namedversion} JPP/httpcomponents httpcore-nio
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 115,152 ----
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:aggregate
  
  %install
! rm -rf %{buildroot}
! 
! # jars
! mkdir -p %{buildroot}%{_javadir}/httpcomponents
! cp -p httpcore/target/%{sname}-%{namedversion}.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-%{version}.jar
! cp -p httpcore/target/%{sname}-%{namedversion}-sources.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-sources-%{version}.jar
! cp -p httpcore-nio/target/%{sname}-nio-%{namedversion}.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-nio-%{version}.jar
! cp -p httpcore-nio/target/%{sname}-nio-%{namedversion}-sources.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-nio-sources-%{version}.jar
! (cd %{buildroot}%{_javadir} && ln -s httpcomponents/httpcore-%{version}.jar jakarta-httpcore-%{version}.jar && ln -s httpcomponents/httpcore-nio-%{version}.jar jakarta-httpcore-nio-%{version}.jar)
! (cd %{buildroot}%{_javadir}/httpcomponents && ln -s httpcore-nio-%{version}.jar httpcore-niossl-%{version}.jar)
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -s ${jar} `echo $jar | sed  "s|-%{version}||g"`; done)
! (cd %{buildroot}%{_javadir}/httpcomponents && for jar in *-%{version}.jar; do ln -s ${jar} `echo $jar | sed  "s|-%{version}||g"`; done)
  
  # poms
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
! cp -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcomponents-core %{namedversion} JPP/httpcomponents core
! cp -p httpcore/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore %{namedversion} JPP/httpcomponents httpcore
! cp -p httpcore-nio/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-nio %{namedversion} JPP/httpcomponents httpcore-nio
! cp -p httpcore-nio/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-niossl %{namedversion} JPP/httpcomponents httpcore-nio
  
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
! rm -rf %{buildroot}
  
  %post
***************
*** 154,160 ****
  %files
  %defattr(0644,root,root,0755)
! #%{_javadir}/*.jar
! #%{_javadir}/httpcomponents/*.jar
! #%{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/%{name}
  
--- 158,182 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}*/jakarta-httpcore-%{version}.jar
! %{_javadir}*/jakarta-httpcore.jar
! %{_javadir}*/jakarta-httpcore-nio-%{version}.jar
! %{_javadir}*/jakarta-httpcore-nio.jar
! %dir %{_javadir}*/httpcomponents
! %{_javadir}*/httpcomponents/%{sname}-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio.jar
! %{_javadir}*/httpcomponents/%{sname}-sources-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-sources.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-sources-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-sources.jar
! %{_javadir}*/httpcomponents/httpcore-nio-%{version}.jar
! %{_javadir}*/httpcomponents/httpcore-nio.jar
! %{_javadir}*/httpcomponents/httpcore-niossl-%{version}.jar
! %{_javadir}*/httpcomponents/httpcore-niossl.jar
! %{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
  %{_mavendepmapfragdir}/%{name}
  
***************
*** 165,169 ****
  
  %changelog
! * Fri Dec 03 2010 David Walluck <dwalluck at redhat.com> 0:4.1-0.1
  - 4.1
  
--- 187,191 ----
  
  %changelog
! * Thu Dec 09 2010 David Walluck <dwalluck at redhat.com> 0:4.1-1.1
  - 4.1
  
***************
*** 183,185 ****
  * Wed May 23 2007 Ralph Apel <r.apel at r-apel.de> 0:4.0-0.a4.1jpp
  - Initial build.
- 
--- 205,206 ----

--- NEW FILE: hc-httpcore-no-clover.patch ---
--- httpcore/pom.xml.orig	2010-11-13 13:33:28.000000000 -0500
+++ httpcore/pom.xml	2010-12-08 15:06:30.524900457 -0500
@@ -111,7 +111,7 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
+      <!--<plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <configuration>
@@ -128,7 +128,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
     </plugins>
   </build>
 
--- httpcore-nio/pom.xml.orig	2010-11-13 13:33:28.000000000 -0500
+++ httpcore-nio/pom.xml	2010-12-08 15:06:42.966204688 -0500
@@ -103,7 +103,7 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
+      <!--<plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <configuration>
@@ -120,7 +120,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
     </plugins>
   </build>
 




More information about the JPackage-commits mailing list