[Jpackage-commits] dist/ws-commons-axiom/JPP-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ws-commons-axiom.spec, 1.14, 1.15

David Walluck david at ryu.zarb.org
Thu Jul 30 19:09:05 CEST 2009


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

Modified Files:
	.cvsignore sources ws-commons-axiom.spec 
Log Message:
- 1.2.8

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-axiom/JPP-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	4 Aug 2008 22:03:06 -0000	1.3
--- .cvsignore	30 Jul 2009 17:09:03 -0000	1.4
***************
*** 1 ****
! ws-commons-axiom-1.2.7.tar.bz2
--- 1 ----
! ws-commons-axiom-1.2.8.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-axiom/JPP-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	4 Aug 2008 22:03:06 -0000	1.3
--- sources	30 Jul 2009 17:09:03 -0000	1.4
***************
*** 1 ****
! caf76265e735121af5f743eea60c2669  ws-commons-axiom-1.2.7.tar.bz2
--- 1 ----
! 74fe50fdc53023491a051c836bdc9f12  ws-commons-axiom-1.2.8.tar.bz2

Index: ws-commons-axiom.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-axiom/JPP-5/ws-commons-axiom.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** ws-commons-axiom.spec	5 Aug 2008 04:15:57 -0000	1.14
--- ws-commons-axiom.spec	30 Jul 2009 17:09:03 -0000	1.15
***************
*** 34,49 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without          maven
! 
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
  
  %define section free
  
  Name:           ws-commons-axiom
! Version:        1.2.7
! Release:        3%{?dist}
  Epoch:          0
  Summary:        AXIOM XML infoset model for Apache Axis2
--- 34,51 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with gcj_support
! %bcond_without maven
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
  %define section free
  
  Name:           ws-commons-axiom
! Version:        1.2.8
! Release:        1%{?dist}
  Epoch:          0
  Summary:        AXIOM XML infoset model for Apache Axis2
***************
*** 51,56 ****
  Url:            http://ws.apache.org/commons/axiom/
  Group:          Text Processing/Markup/XML
! # svn export http://svn.apache.org/repos/asf/webservices/commons/tags/axiom/1.2.7/ ws-commons-axiom-1.2.7
! # tar cvjf ws-commons-axiom-1.2.7.tar.bz2 ws-commons-axiom-1.2.7
  Source0:        ws-commons-axiom-%{version}.tar.bz2
  Source1:        %{name}-settings.xml
--- 53,57 ----
  Url:            http://ws.apache.org/commons/axiom/
  Group:          Text Processing/Markup/XML
! # svn -q export http://svn.apache.org/repos/asf/webservices/commons/tags/axiom/1.2.8/ ws-commons-axiom-1.2.8 && tar cjf ws-commons-axiom-1.2.8.tar.bz2 ws-commons-axiom-1.2.8
  Source0:        ws-commons-axiom-%{version}.tar.bz2
  Source1:        %{name}-settings.xml
***************
*** 96,101 ****
  BuildRequires:  xml-commons-jaxp-1.3-apis
  BuildRequires:  xmlunit
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  Requires:       stax_1_0_api
  Requires:       xml-commons-jaxp-1.3-apis
--- 97,102 ----
  BuildRequires:  xml-commons-jaxp-1.3-apis
  BuildRequires:  xmlunit
! Requires(post): jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
  Requires:       stax_1_0_api
  Requires:       xml-commons-jaxp-1.3-apis
***************
*** 122,126 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
! Obsoletes:      apache-axiom-javadoc = 0:1.0
  Provides:       apache-axiom-javadoc = %{epoch}:%{version}-%{release}
  
--- 123,127 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
! Obsoletes:      apache-axiom-javadoc < %{epoch}:%{version}-%{release}
  Provides:       apache-axiom-javadoc = %{epoch}:%{version}-%{release}
  
***************
*** 142,146 ****
  
  # fix eol
! %{__perl} -pi -e 's/\r$//g' README.txt NOTICE.txt RELEASE-NOTE.txt
  
  rm -f src/site/xdoc/download.*
--- 143,147 ----
  
  # fix eol
! %{__perl} -pi -e 's/\r$//g' LICENSE.txt NOTICE.txt README.txt RELEASE-NOTE.txt
  
  rm -f src/site/xdoc/download.*
***************
*** 157,161 ****
  cp -p src/site/site.xml modules/axiom-impl/src/site
  
- %build
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
--- 158,161 ----
***************
*** 168,171 ****
--- 168,172 ----
  sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
  
+ %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
***************
*** 188,202 ****
  )
  pushd modules/axiom-api
! ant -Dbuild.sysclasspath=only jar test javadoc
  popd
  AXIOM_API_JAR=`ls $(pwd)/modules/axiom-api/target/axiom-api-*.jar`
  CLASSPATH=$CLASSPATH:${AXIOM_API_JAR}
  pushd modules/axiom-impl
! ant -Dbuild.sysclasspath=only jar test javadoc
  popd
  AXIOM_IMPL_JAR=`ls $(pwd)/modules/axiom-impl/target/axiom-impl-*.jar`
  CLASSPATH=$CLASSPATH:${AXIOM_IMPL_JAR}
  pushd modules/axiom-dom
! ant -Dbuild.sysclasspath=only jar test javadoc
  popd
  
--- 189,203 ----
  )
  pushd modules/axiom-api
! %{ant} -Dbuild.sysclasspath=only jar test javadoc
  popd
  AXIOM_API_JAR=`ls $(pwd)/modules/axiom-api/target/axiom-api-*.jar`
  CLASSPATH=$CLASSPATH:${AXIOM_API_JAR}
  pushd modules/axiom-impl
! %{ant} -Dbuild.sysclasspath=only jar test javadoc
  popd
  AXIOM_IMPL_JAR=`ls $(pwd)/modules/axiom-impl/target/axiom-impl-*.jar`
  CLASSPATH=$CLASSPATH:${AXIOM_IMPL_JAR}
  pushd modules/axiom-dom
! %{ant} -Dbuild.sysclasspath=only jar test javadoc
  popd
  
***************
*** 219,229 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -m 644 target/axiom-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -m 644 modules/axiom-api/target/axiom-api-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
! install -m 644 modules/axiom-impl/target/axiom-impl-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar
! install -m 644 modules/axiom-dom/target/axiom-dom-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-dom-%{version}.jar
  %add_to_maven_depmap org.apache.ws.commons.axiom axiom %{version} JPP %{name}
--- 220,230 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -p -m 644 target/axiom-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -p -m 644 modules/axiom-api/target/axiom-api-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
! install -p -m 644 modules/axiom-impl/target/axiom-impl-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar
! install -p -m 644 modules/axiom-dom/target/axiom-dom-*.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-dom-%{version}.jar
  %add_to_maven_depmap org.apache.ws.commons.axiom axiom %{version} JPP %{name}
***************
*** 289,293 ****
  %files
  %defattr(0644,root,root,0755)
! %doc *.txt
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
--- 290,294 ----
  %files
  %defattr(0644,root,root,0755)
! %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTE.txt 
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
***************
*** 298,303 ****
  %{_javadir}/%{name}-impl-%{version}.jar
  %{_javadir}/%{name}-impl.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 299,307 ----
  %{_javadir}/%{name}-impl-%{version}.jar
  %{_javadir}/%{name}-impl.jar
! %{_datadir}/maven2/poms/JPP.%{name}.pom
! %{_datadir}/maven2/poms/JPP.%{name}-api.pom
! %{_datadir}/maven2/poms/JPP.%{name}-dom.pom
! %{_datadir}/maven2/poms/JPP.%{name}-impl.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 317,320 ****
--- 321,327 ----
  
  %changelog
+ * Thu Jul 30 2009 David Walluck <dwalluck at redhat.com> 0:1.2.8-1
+ - 1.2.8
+ 
  * Mon Aug 04 2008 David Walluck <dwalluck at redhat.com> 0:1.2.7-2
  - build with maven2




More information about the JPackage-commits mailing list