[Jpackage-commits] dist/xmlunit/JPP-6 xmlunit-component-info.xml, NONE, 1.1 xmlunit-no-javac-target.patch, 1.3, 1.4 xmlunit.spec, 1.4, 1.5

David Walluck david at ryu.zarb.org
Thu Feb 12 19:46:58 CET 2009


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

Modified Files:
	xmlunit.spec 
Added Files:
	xmlunit-component-info.xml xmlunit-no-javac-target.patch 
Log Message:
- reintroduce xmlunit-no-javac-target.patch
- add repolib


Index: xmlunit.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xmlunit/JPP-6/xmlunit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** xmlunit.spec	12 Feb 2009 18:29:41 -0000	1.4
--- xmlunit.spec	12 Feb 2009 18:46:56 -0000	1.5
***************
*** 35,38 ****
--- 35,43 ----
  
  %bcond_with manual
+ %bcond_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/xmlunit-xmlunit/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
***************
*** 42,46 ****
  Name:           xmlunit
  Version:        1.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Provides classes to do asserts on XML
--- 47,51 ----
  Name:           xmlunit
  Version:        1.2
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Provides classes to do asserts on XML
***************
*** 50,53 ****
--- 55,60 ----
  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
+ Source2:        xmlunit-component-info.xml
+ Patch0:         xmlunit-no-javac-target.patch
  Requires(post): jpackage-utils >= 0:1.7.3
  Requires(postun): jpackage-utils >= 0:1.7.3
***************
*** 96,101 ****
--- 103,120 ----
  Documentation 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 -n xmlunit-%{version}
+ %patch0 -p1
  
  %{__perl} -pi -e 's/\r$//g' README.txt LICENSE.txt
***************
*** 116,121 ****
  
  cat > build.properties << EOF
- javac.source=1.3
- javac.target=1.3
  junit.lib=$(build-classpath junit)
  %if %with manual
--- 135,138 ----
***************
*** 161,164 ****
--- 178,195 ----
  %endif
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE2} %{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
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/xmlunit.jar
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
***************
*** 209,213 ****
--- 240,254 ----
  %endif
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Thu Feb 12 2009 David Walluck <dwalluck at redhat.com> 0:1.2-3
+ - reintroduce xmlunit-no-javac-target.patch
+ - add repolib
+ 
  * Thu Feb 12 2009 David Walluck <dwalluck at redhat.com> 0:1.2-2
  - disable manual by default (Fedora docbook5-style-xsl bug)

--- NEW FILE: xmlunit-no-javac-target.patch ---
--- xmlunit-1.2/build.xml.orig	2008-06-10 11:23:48.000000000 -0400
+++ xmlunit-1.2/build.xml	2009-02-12 13:39:48.426645776 -0500
@@ -53,8 +53,6 @@
   <property name="userguide.docs.dir" value="${docs.dir}/userguide"/>
 
   <!-- javac properties -->
-  <property name="javac.source" value="1.3"/>
-  <property name="javac.target" value="1.3"/>
   <property name="javac.debug" value="true"/>
 
   <!-- junit task properties -->
@@ -105,7 +103,7 @@
   <target name="compile" depends="-init"
     description="compiles sources and tests">
     <javac srcdir="${src.dir}/java" destdir="${out.dir}"
-      debug="${javac.debug}" target="${javac.target}" source="${javac.source}">
+      debug="${javac.debug}">
       <classpath>
         <pathelement location="${xmlxsl.lib}"/>
         <pathelement location="${junit.lib}"/>
@@ -115,7 +113,7 @@
       <exclude name="**/*XPathRegexAssert.java" unless="regexp.present"/>
     </javac>
     <javac srcdir="${test.dir}/java" destdir="${test.out.dir}"
-      debug="${javac.debug}" target="${javac.target}" source="${javac.source}">
+      debug="${javac.debug}">
       <classpath>
         <pathelement location="${out.dir}"/>
         <pathelement location="${xmlxsl.lib}"/>

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


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

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




More information about the JPackage-commits mailing list