[Jpackage-commits] dist/httpunit/JPP-6 .cvsignore, 1.2, 1.3 httpunit-component-info.xml, NONE, 1.1 httpunit.build.patch, 1.1, 1.2 httpunit.spec, 1.2, 1.3 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Mon Feb 2 23:04:33 CET 2009


Update of /home/projects/jpackage/cvs/dist/httpunit/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv6672

Modified Files:
	.cvsignore httpunit.build.patch httpunit.spec sources 
Added Files:
	httpunit-component-info.xml 
Log Message:
- add repolib

Index: httpunit.build.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/httpunit/JPP-6/httpunit.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** httpunit.build.patch	26 Sep 2008 17:20:01 -0000	1.1
--- httpunit.build.patch	2 Feb 2009 22:04:31 -0000	1.2
***************
*** 1,6 ****
! --- build.xml.orig	2004-10-03 10:17:14.000000000 +0300
! +++ build.xml	2004-11-13 18:47:27.904846669 +0200
! @@ -51,7 +51,7 @@
!  <target name="check_for_optional_packages">
       <available property="jsdk.present"     classname="javax.servlet.http.HttpServlet"
                                              classpathref="base.classpath" />
--- 1,6 ----
! --- build.xml.orig	2008-05-20 16:25:36.000000000 -0400
! +++ build.xml	2009-02-02 17:01:44.998216257 -0500
! @@ -104,7 +104,7 @@
!  <target name="check_for_optional_packages" depends="prepare">
       <available property="jsdk.present"     classname="javax.servlet.http.HttpServlet"
                                              classpathref="base.classpath" />
***************
*** 10,17 ****
       <available property="jaxp.present"     classname="javax.xml.parsers.DocumentBuilderFactory"
                                              classpathref="base.classpath" />
! @@ -173,6 +173,13 @@
!  
   
!  <!--  ===================================================================  -->
  +<!--  Creates the test jar archive                                         -->
  +<!--  ===================================================================  -->
--- 10,18 ----
       <available property="jaxp.present"     classname="javax.xml.parsers.DocumentBuilderFactory"
                                              classpathref="base.classpath" />
! @@ -228,6 +228,13 @@
!      </java>
!  </target>
   
! +<!--  ===================================================================  -->
  +<!--  Creates the test jar archive                                         -->
  +<!--  ===================================================================  -->
***************
*** 20,28 ****
  +    <jar jarfile="${lib.dir}/${name}-test.jar" basedir="${test.classes}" includes="com/**" />
  +</target>
! +
!  <!--  Creates the jar archive                                              -->
   <!--  ===================================================================  -->
!  <target name="jar" depends="compile">
! @@ -191,6 +198,17 @@
   
   
--- 21,28 ----
  +    <jar jarfile="${lib.dir}/${name}-test.jar" basedir="${test.classes}" includes="com/**" />
  +</target>
!  
   <!--  ===================================================================  -->
!  <!--  Creates the jar archive                                              -->
! @@ -248,6 +255,17 @@
   
   

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/httpunit/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	26 Sep 2008 17:20:01 -0000	1.2
--- sources	2 Feb 2009 22:04:31 -0000	1.3
***************
*** 1 ****
! 9d841b1c78568371df357bb35a32a3a6  httpunit-1.6.2.zip
--- 1 ----
! 32a6eece5128f886138694909a0f0722  httpunit-1.7.zip

--- NEW FILE: httpunit-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="httpunit"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="httpunit.jar"/>


    <export>
      <include input="httpunit.jar"/>

    </export>
  </component>
</project>

Index: httpunit.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/httpunit/JPP-6/httpunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** httpunit.spec	30 Sep 2008 17:30:36 -0000	1.2
--- httpunit.spec	2 Feb 2009 22:04:31 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,45 ****
  #
  
  %define section free
  
  Name:           httpunit
  Version:        1.7
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Automated web site testing toolkit
  License:        MIT
  URL:            http://httpunit.sourceforge.net/
  Source0:        http://download.sourceforge.net/httpunit/httpunit-1.7.zip
  Patch0:         %{name}.build.patch
  Patch1:         %{name}-JavaScript-NotAFunctionException.patch
  Patch2:         %{name}-servlettest.patch
  BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
--- 29,64 ----
  #
  
+ %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+ %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+ %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+ %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+ 
+ %bcond_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/%{name}/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
  
  Name:           httpunit
  Version:        1.7
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Automated web site testing toolkit
  License:        MIT
+ Group:          Development/Testing
  URL:            http://httpunit.sourceforge.net/
  Source0:        http://download.sourceforge.net/httpunit/httpunit-1.7.zip
+ Source1:        httpunit-component-info.xml
  Patch0:         %{name}.build.patch
  Patch1:         %{name}-JavaScript-NotAFunctionException.patch
  Patch2:         %{name}-servlettest.patch
+ Requires:       junit >= 0:3.8
+ Requires:       servlet24
+ Requires:       jaxp_parser_impl
+ # As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
+ Requires:       nekohtml
+ Requires:       rhino
  BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
***************
*** 51,65 ****
  BuildRequires:  jaf >= 0:1.0.2
  BuildRequires:  rhino
- Requires:       junit >= 0:3.8
- Requires:       servlet24
- Requires:       jaxp_parser_impl
- # As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
- Requires:       nekohtml
- Requires:       rhino
- Group:          Development/Testing
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! Vendor:         JPackage Project
! Distribution:   JPackage
  
  %description
--- 70,75 ----
  BuildRequires:  jaf >= 0:1.0.2
  BuildRequires:  rhino
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 70,101 ****
  A companion framework, ServletUnit is included in the package.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
! Javadoc for %{name}
  
! %package        manual
  Summary:        Manual for %{name}
  Group:          Development/Testing
  
! %description    manual
! Documentation for %{name}
  
! %package        demo
  Summary:        Demo for %{name}
  Group:          Development/Testing
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  
! %description    demo
  Demonstrations and samples for %{name}.
  
  
  %prep
  %setup -q
  %patch0 -p0
! %patch1 -b .sav
! %patch2
  find . -name "*.jar" | xargs -t rm
  rm -r doc/api
--- 80,121 ----
  A companion framework, ServletUnit is included in the package.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
! Javadoc for %{name}.
  
! %package manual
  Summary:        Manual for %{name}
  Group:          Development/Testing
  
! %description manual
! Documentation for %{name}.
  
! %package demo
  Summary:        Demo for %{name}
  Group:          Development/Testing
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  
! %description demo
  Demonstrations and samples for %{name}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
  
  %prep
  %setup -q
  %patch0 -p0
! %patch1 -p0
! %patch2 -p0
  find . -name "*.jar" | xargs -t rm
  rm -r doc/api
***************
*** 112,116 ****
  export CLASSPATH=$(build-classpath jaf javamail)
  export OPT_JAR_LIST=:
! ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
    jar javadocs test servlettest testjar examplesjar
  
--- 132,136 ----
  export CLASSPATH=$(build-classpath jaf javamail)
  export OPT_JAR_LIST=:
! %{ant} -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
    jar javadocs test servlettest testjar examplesjar
  
***************
*** 146,149 ****
--- 166,183 ----
    $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-examples-%{version}.jar
  
+ %if %with repolib
+ %{__install} -d -m 0755 %{buildroot}%{repodir}
+ %{__install} -d -m 0755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{PATCH0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{PATCH1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{PATCH2} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
+ %endif
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 167,171 ****
--- 201,214 ----
  %{_datadir}/%{name}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.7-2
+ - add repolib
+ 
  * Tue Sep 30 2008 David Walluck <dwalluck at redhat.com> 0:1.7-1
  - 1.7

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/httpunit/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	26 Sep 2008 17:20:01 -0000	1.2
--- .cvsignore	2 Feb 2009 22:04:31 -0000	1.3
***************
*** 1 ****
! httpunit-1.6.2.zip
--- 1 ----
! httpunit-1.7.zip




More information about the JPackage-commits mailing list