[Jpackage-commits] rpms/free/xmlunit xmlunit-1.0.pom, 1.2, NONE xmlunit-1.2.pom, NONE, 1.1 xmlunit-java5-enum.patch, 1.1, NONE xmlunit-no-javac-target.patch, 1.1, NONE xmlunit.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Thu Feb 12 19:33:45 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/xmlunit
In directory ryu.zarb.org:/tmp/SDftThuAoI/rpms/free/xmlunit

Modified Files:
	xmlunit.spec 
Added Files:
	xmlunit-1.2.pom 
Removed Files:
	xmlunit-1.0.pom xmlunit-java5-enum.patch 
	xmlunit-no-javac-target.patch 
Log Message:
1.2-2.jpp6

--- xmlunit-1.0.pom DELETED ---

Index: xmlunit.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xmlunit/xmlunit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** xmlunit.spec	29 Jul 2008 20:39:25 -0000	1.3
--- xmlunit.spec	12 Feb 2009 18:33:43 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,32 ****
--- 29,39 ----
  #
  
+ %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_with manual
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
***************
*** 34,47 ****
  
  Name:           xmlunit
! Version:        1.0
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Provides classes to do asserts on XML
  License:        BSD
  URL:            http://xmlunit.sourceforge.net/
! Source0:        http://download.sourceforge.net/xmlunit/xmlunit1.0.zip
! Source1:        http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
! Patch0:         xmlunit-java5-enum.patch
! Patch1:         xmlunit-no-javac-target.patch
  BuildRequires:  jpackage-utils
  BuildRequires:  java-devel
--- 41,59 ----
  
  Name:           xmlunit
! Version:        1.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Provides classes to do asserts on XML
  License:        BSD
+ Group:          Development/Testing
  URL:            http://xmlunit.sourceforge.net/
! Source0:        http://downloads.sourceforge.net/xmlunit/xmlunit-1.2-src.zip
! Source1:        http://repo1.maven.org/maven2/xmlunit/xmlunit/1.2/xmlunit-1.2.pom
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! %if %with manual
! BuildRequires:  dblatex
! BuildRequires:  docbook5-style-xsl
! %endif
  BuildRequires:  jpackage-utils
  BuildRequires:  java-devel
***************
*** 56,69 ****
  Requires:       xml-commons-jaxp-1.3-apis
  Requires:       xerces-j2
- Group:          Development/Testing
- %if ! %{gcj_support}
- BuildArch:      noarch
- %endif
  %if %{gcj_support}
! BuildRequires:    java-gcj-compat-devel
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- Requires(post):    jpackage-utils >= 0:1.7.3
- Requires(postun):  jpackage-utils >= 0:1.7.3
  
  %description
--- 68,77 ----
  Requires:       xml-commons-jaxp-1.3-apis
  Requires:       xerces-j2
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 80,96 ****
  Javadoc for %{name}.
  
  %prep
! %setup -q -n %{name}
! %patch0 -p1
! %patch1 -p1
  
  %{__perl} -pi -e 's/\r$//g' README.txt LICENSE.txt
  
! # remove all binary libs and javadocs
! find . -name "*.jar" | xargs rm
! rm -r doc
  
  cat > build.properties << EOF
  junit.lib=$(build-classpath junit)
  xmlxsl.lib=$(build-classpath xalan-j2 xerces-j2 xml-commons-jaxp-1.3-apis)
  test.report.dir=test
--- 88,125 ----
  Javadoc for %{name}.
  
+ %package manual
+ 
+ Summary:        Manual for %{name}
+ Group:          Development/Java
+ 
+ %description manual
+ Documentation for %{name}.
+ 
  %prep
! %setup -q -n xmlunit-%{version}
  
  %{__perl} -pi -e 's/\r$//g' README.txt LICENSE.txt
+ rm -r userguide
  
! %if %with manual
! DB5_XSL=`/bin/echo %{_datadir}/sgml/docbook/xsl-ns-stylesheets-*/ 2>/dev/null`
! 
! if [ ! -d "$DB5_XSL" ]; then
!     DB5_XSL=`/bin/echo %{_datadir}/sgml/docbook/xsl-stylesheets-db5-*/ 2>/dev/null`
! fi
! 
! if [ ! -d "$DB5_XSL" ]; then
!     echo Could not find db5.xsl directory
!     exit 1
! fi
! %endif
  
  cat > build.properties << EOF
+ javac.source=1.3
+ javac.target=1.3
  junit.lib=$(build-classpath junit)
+ %if %with manual
+ db5.xsl=$DB5_XSL
+ %endif
  xmlxsl.lib=$(build-classpath xalan-j2 xerces-j2 xml-commons-jaxp-1.3-apis)
  test.report.dir=test
***************
*** 99,104 ****
  %build
  export CLASSPATH=
! export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
! ant jar test docs
  
  %install
--- 128,137 ----
  %build
  export CLASSPATH=
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`"
! %if %with manual
! %{ant} dist
! %else
! %{ant} jar javadocs test
! %endif
  
  %install
***************
*** 106,111 ****
  
  mkdir -p $RPM_BUILD_ROOT%{_javadir}
! install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
  # Jar versioning
--- 139,143 ----
  
  mkdir -p $RPM_BUILD_ROOT%{_javadir}
! install -p -m 0644 build/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  
  # Jar versioning
***************
*** 114,126 ****
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! 
! install -m 644 %{SOURCE1} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # Javadoc
  mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
--- 146,164 ----
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 %{SOURCE1} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
  # Javadoc
  mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
+ %if %with manual
+ # Manual
+ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ cp -pr build/doc/userguide/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
***************
*** 130,134 ****
  rm -rf $RPM_BUILD_ROOT
  
- 
  %post
  %update_maven_depmap
--- 168,171 ----
***************
*** 151,158 ****
  %files
  %defattr(0644,root,root,0755)
! %doc README.txt LICENSE.txt XMLUnit.pdf example.html
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 188,196 ----
  %files
  %defattr(0644,root,root,0755)
! %doc README.txt LICENSE.txt
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 165,169 ****
--- 203,219 ----
  %{_javadocdir}/%{name}
  
+ %if %with manual
+ %files manual
+ %defattr(0644,root,root,0755)
+ %doc %{_docdir}/%{name}-%{version}
+ %endif
+ 
  %changelog
+ * Thu Feb 12 2009 David Walluck <dwalluck at redhat.com> 0:1.2-2
+ - disable manual by default (Fedora docbook5-style-xsl bug)
+ 
+ * Thu Feb 12 2009 David Walluck <dwalluck at redhat.com> 0:1.2-1
+ - 1.2
+ 
  * Tue Jul 29 2008 David Walluck <dwalluck at redhat.com> 0:1.0-6
  - patch for Java5

--- NEW FILE: xmlunit-1.2.pom ---
<?xml version="1.0"?>
<!--
Copyright (c) 2007-2008, Jeff Martin, Tim Bacon
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

    * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
    * 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.
    * Neither the name of the xmlunit.sourceforge.net 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.
-->

<!--

  This POM is not usable as means to build XMLUnit with Maven2, it is
  a minimal POM to allow XMLUnit's artifacts to be added to a Maven
  repository.

-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>xmlunit</groupId>
  <artifactId>xmlunit</artifactId>
  <packaging>jar</packaging>
  <name>XMLUnit for Java</name>
  <version>1.2</version>
  <url>http://xmlunit.sourceforge.net/</url>
  <description>XMLUnit compares a control XML document to a test document or the result of a transformation, validates documents, and compares the results of XPath expressions.</description>
  <licenses>
    <license>
      <name>BSD License</name>
      <url>http://xmlunit.svn.sourceforge.net/viewvc/*checkout*/xmlunit/trunk/xmlunit/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <url>http://xmlunit.svn.sourceforge.net/viewvc/xmlunit/</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
      <optional>true</optional>
    </dependency>
  </dependencies>
</project>

--- xmlunit-no-javac-target.patch DELETED ---

--- xmlunit-java5-enum.patch DELETED ---




More information about the JPackage-commits mailing list