[Jpackage-commits] dist/ws-commons-neethi/JPP-5 ws-commons-neethi-jpp-depmap.xml, 1.1, 1.2 ws-commons-neethi-pom_xml.patch, 1.1, 1.2 ws-commons-neethi.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Mon Feb 9 09:17:35 CET 2009


Update of /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv23380

Modified Files:
	ws-commons-neethi-jpp-depmap.xml 
	ws-commons-neethi-pom_xml.patch ws-commons-neethi.spec 
Log Message:
2.0.1-3.jpp5

Index: ws-commons-neethi.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-5/ws-commons-neethi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** ws-commons-neethi.spec	23 Jul 2008 15:52:55 -0000	1.2
--- ws-commons-neethi.spec	9 Feb 2009 08:17:33 -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.
  #
***************
*** 42,56 ****
  Name:           ws-commons-neethi
  Version:        2.0.1
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Apache Neethi WS-Policy implementation 
! License:        ASL 2.0
  Url:            http://ws.apache.org/commons/neethi/index.html
  Group:          Text Processing/Markup/XML
- Provides:       neethi = %{epoch}:%{version}-%{release}
- Obsoletes:      neethi < %{epoch}:%{version}-%{release}
  
! # svn export http://svn.apache.org/repos/asf/webservices/commons/tags/neethi/2_0_1/ neethi
  Source0:        %{short_name}-%{version}.tar.gz
  Source1:        %{name}-setting.xml
  Source2:        %{name}-jpp-depmap.xml
--- 42,59 ----
  Name:           ws-commons-neethi
  Version:        2.0.1
! Release:        3%{dist}
  Epoch:          0
  Summary:        Apache Neethi WS-Policy implementation 
! License:        Apache Software License 2.0
  Url:            http://ws.apache.org/commons/neethi/index.html
  Group:          Text Processing/Markup/XML
  
! # ws-commons-policy has NOT been renamed to neethi
! Provides:   neethi = %{epoch}:%{version}-%{release}
! Obsoletes:  neethi <= 0:1.0.1
! 
  Source0:        %{short_name}-%{version}.tar.gz
+ ##svn export http://svn.apache.org/repos/asf/webservices/commons/tags/neethi/2_0_1/ neethi
+ 
  Source1:        %{name}-setting.xml
  Source2:        %{name}-jpp-depmap.xml
***************
*** 59,91 ****
  Patch1:         %{name}-site_xml.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  jdepend
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven2-default-skin
  %endif
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  %if %{gcj_support}
  BuildRequires:    java-gcj-compat-devel
  %endif
  BuildRequires:  ws-commons-axiom >= 0:1.2.3
  BuildRequires:  wstx >= 0:3.2.1
! BuildRequires:  bea-stax-api
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  wsdl4j >= 0:1.6.2
  
! Requires:       jpackage-utils >= 0:1.7.2
  Requires:       ws-commons-axiom >= 0:1.2.3
  Requires:       wstx >= 0:3.2.1
! Requires:       bea-stax-api
  Requires:       jakarta-commons-logging
  Requires:       wsdl4j >= 0:1.6.2
--- 62,108 ----
  Patch1:         %{name}-site_xml.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  jdepend
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.7
! BuildRequires:  maven2-plugin-antrun
! BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
+ BuildRequires:  maven2-plugin-one
+ BuildRequires:  maven2-plugin-project-info-reports
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-default-skin
+ BuildRequires:  maven-jxr
+ BuildRequires:  maven-release
+ BuildRequires:  maven-surefire-plugin
+ BuildRequires:  mojo-maven2-plugin-jdepend
  %endif
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  %if %{gcj_support}
+ BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
+ Requires(post):   java-gcj-compat
+ Requires(postun): java-gcj-compat
  %endif
  BuildRequires:  ws-commons-axiom >= 0:1.2.3
  BuildRequires:  wstx >= 0:3.2.1
! BuildRequires:  stax_1_0_api
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  wsdl4j >= 0:1.6.2
  
! Requires:       jpackage-utils >= 0:1.7.5
! Requires:       java >= 0:1.5.0
  Requires:       ws-commons-axiom >= 0:1.2.3
  Requires:       wstx >= 0:3.2.1
! Requires:       stax_1_0_api
  Requires:       jakarta-commons-logging
  Requires:       wsdl4j >= 0:1.6.2
***************
*** 95,99 ****
  %endif
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
--- 112,116 ----
  %endif
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
  
  %description
***************
*** 113,120 ****
  %prep
  %setup -q -n %{short_name}
! cp -p %{SOURCE1} settings.xml
! cp -p %{SOURCE3} build.xml
! %patch0 -p0 -b .sav
! %patch1 -p0 -b .sav
  
  %build
--- 130,137 ----
  %prep
  %setup -q -n %{short_name}
! cp %{SOURCE1} settings.xml
! cp %{SOURCE3} build.xml
! %patch0 -b .sav
! %patch1 -b .sav
  
  %build
***************
*** 141,145 ****
  %else
  export CLASSPATH=$(build-classpath \
! bea-stax-api \
  ws-commons-axiom-api \
  ws-commons-axiom-impl \
--- 158,162 ----
  %else
  export CLASSPATH=$(build-classpath \
! stax_1_0_api \
  ws-commons-axiom-api \
  ws-commons-axiom-impl \
***************
*** 147,151 ****
  )
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
- export OPT_JAR_LIST=:
  ant -Dbuild.sysclasspath=only jar test javadoc
  %endif
--- 164,167 ----
***************
*** 153,157 ****
  %install
  rm -rf $RPM_BUILD_ROOT
- 
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  install -m 644 target/%{short_name}-%{version}.jar \
--- 169,172 ----
***************
*** 176,183 ****
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- # FIXME: (dwalluck): breaks short-circuit
  rm -rf target/site/apidocs
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
--- 191,204 ----
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  rm -rf target/site/apidocs
  
+ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ %if %{with_maven}
+ cp -r target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ %endif
+ 
  %if %{gcj_support}
+ export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 206,217 ****
  %files
  %defattr(0644,root,root,0755)
! %doc *.txt target/site/*
  %{_javadir}/*.jar
- %if %{with_maven}
  %{_datadir}/maven2/poms/*
- %endif
  %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
  %endif
--- 227,237 ----
  %files
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}/*
! %dir %{_docdir}/%{name}-%{version}
  %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
  %endif
***************
*** 219,233 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
! * Wed Jul 23 2008 David Walluck <dwalluck at redhat.com> 0:2.0.1-3
! - remove javadoc scriptlets
! - update License
! - update BuildRoot
! - remove Vendor and Distribution
! - GCJ fixes
! - fix maven directory ownership
  
  * Wed Jul 11 2007 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-2jpp
--- 239,248 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
! * Mon Feb 09 2009 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-3.jpp5
! - Rebuild with current best practices
  
  * Wed Jul 11 2007 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-2jpp

Index: ws-commons-neethi-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-5/ws-commons-neethi-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** ws-commons-neethi-jpp-depmap.xml	23 Jul 2008 15:42:41 -0000	1.1
--- ws-commons-neethi-jpp-depmap.xml	9 Feb 2009 08:17:33 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <dependencies>
+ 
  	<dependency>
  		<maven>

Index: ws-commons-neethi-pom_xml.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-5/ws-commons-neethi-pom_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** ws-commons-neethi-pom_xml.patch	23 Jul 2008 15:42:41 -0000	1.1
--- ws-commons-neethi-pom_xml.patch	9 Feb 2009 08:17:33 -0000	1.2
***************
*** 1,4 ****
  --- pom.xml.sav	2007-04-17 20:50:20.000000000 +0200
! +++ pom.xml	2007-05-28 15:29:52.000000000 +0200
  @@ -269,6 +269,16 @@
   			<artifactId>wstx-asl</artifactId>
--- 1,4 ----
  --- pom.xml.sav	2007-04-17 20:50:20.000000000 +0200
! +++ pom.xml	2009-01-28 20:50:13.000000000 +0100
  @@ -269,6 +269,16 @@
   			<artifactId>wstx-asl</artifactId>
***************
*** 18,19 ****
--- 18,32 ----
   			<groupId>commons-logging</groupId>
   			<artifactId>commons-logging</artifactId>
+ @@ -300,9 +310,9 @@
+  				<version>2.0-beta-1-SNAPSHOT</version>
+  			</plugin>
+  			<plugin>
+ -				<groupId>org.codehaus.mojo</groupId>
+ -				<artifactId>jxr-maven-plugin</artifactId>
+ -				<version>2.0-beta-2-SNAPSHOT</version>
+ +				<groupId>org.apache.maven.plugins</groupId>
+ +				<artifactId>maven-jxr-plugin</artifactId>
+ +				<version>2.1</version>
+  			</plugin>
+  		</plugins>
+  	</reporting>




More information about the JPackage-commits mailing list