[Jpackage-commits] dist/xmlbeans/JPP-5 xmlbeans.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Fri Feb 27 22:35:17 CET 2009


Update of /home/projects/jpackage/cvs/dist/xmlbeans/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv3563

Modified Files:
	xmlbeans.spec 
Log Message:
- spec cleanup
- stop xcresolver.zip from downloading


Index: xmlbeans.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xmlbeans/JPP-5/xmlbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xmlbeans.spec	27 Feb 2009 21:01:56 -0000	1.1
--- xmlbeans.spec	27 Feb 2009 21:35:15 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,44 ****
  #
  
! %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 maven plugin
! # give rpmbuild option '--without maven'
  
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define section         free
! %define source_top      %{name}-%{cvs_version}
  
  Summary:        XML-Java binding tool
  URL:            http://xmlbeans.apache.org
  Source0:        xmlbeans-2.3.0-src.tgz
--- 29,49 ----
  #
  
! %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}}
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! %define section free
! %define source_top %{name}-%{cvs_version}
  
+ Name:           xmlbeans
+ Version:        2.3.0
+ Release:        2%{?dist}
+ Epoch:          0
  Summary:        XML-Java binding tool
+ License:        ASL 2.0
+ Group:          Development/Libraries/Java
  URL:            http://xmlbeans.apache.org
  Source0:        xmlbeans-2.3.0-src.tgz
***************
*** 48,61 ****
  Source3:        http://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-xmlpublic/2.3.0/xmlbeans-xmlpublic-2.3.0.pom
  Source4:        http://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-qname/2.3.0/xmlbeans-qname-2.3.0.pom
! 
! Name:           xmlbeans
! Version:        2.3.0
! Release:        1%{dist}
! Epoch:          0
! License:        Apache Software License 2
! Group:          Development/Libraries/Java
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
--- 53,61 ----
  Source3:        http://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-xmlpublic/2.3.0/xmlbeans-xmlpublic-2.3.0.pom
  Source4:        http://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-qname/2.3.0/xmlbeans-qname-2.3.0.pom
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       jpackage-utils >= 0:1.7.3
! Requires:       stax_1_0_api
! BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
***************
*** 68,86 ****
  BuildRequires:  saxon8-dom
  BuildRequires:  saxon8-xpath
- Requires:  jpackage-utils >= 0:1.7.5
- Requires:  stax_1_0_api
- 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
! %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %description
--- 68,77 ----
  BuildRequires:  saxon8-dom
  BuildRequires:  saxon8-xpath
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 105,110 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 96,99 ----
***************
*** 121,125 ****
  Summary:        Scripts for %{name}
  Group:          Development/Tools
! Requires:       %{name} = %{epoch}:%{version}
  
  %description scripts
--- 110,114 ----
  Summary:        Scripts for %{name}
  Group:          Development/Tools
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description scripts
***************
*** 143,159 ****
  popd
  
- 
  pushd external/lib
  mv oldxbean.jar.no oldxbean.jar
  ln -sf $(build-classpath stax_1_0_api) jsr173_1.0_api_bundle.jar
! mkdir -p xcresolver.zipexternal/lib/
! touch xcresolver.zipexternal/lib/xcresolver.zip
  popd
  
- 
  %build
  export XMLBEANS_EXTERNALS=/usr/share/java
  export XMLBEANS_HOME=`pwd`
! ant default docs 
  
  %install
--- 132,147 ----
  popd
  
  pushd external/lib
  mv oldxbean.jar.no oldxbean.jar
  ln -sf $(build-classpath stax_1_0_api) jsr173_1.0_api_bundle.jar
! touch xcresolver.zip
  popd
  
  %build
+ export CLASSPATH=
+ export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{nodeps}`"
  export XMLBEANS_EXTERNALS=/usr/share/java
  export XMLBEANS_HOME=`pwd`
! %{ant} default docs 
  
  %install
***************
*** 185,189 ****
  ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar
  
- 
  # bin
  install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
--- 173,176 ----
***************
*** 200,204 ****
  install -p -m 0755 bin/xstc      $RPM_BUILD_ROOT%{_bindir}
  
- 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
--- 187,190 ----
***************
*** 210,217 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
- cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 196,201 ----
***************
*** 220,232 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -sf %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 204,207 ----
***************
*** 248,259 ****
  
  %files
! %defattr(-,root,root,-)
! %{_docdir}/%{name}-%{version}/LICENSE.txt
  %dir %{_javadir}/%{name}
  %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  %if %{gcj_support}
! %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/x*-%{version}.jar.*
  %endif
--- 223,234 ----
  
  %files
! %defattr(0644,root,root,0755)
! %doc LICENSE.txt
  %dir %{_javadir}/%{name}
  %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/x*-%{version}.jar.*
  %endif
***************
*** 262,270 ****
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %files manual
  %defattr(0644,root,root,0755)
! %{_docdir}/%{name}-%{version}
  
  %files scripts
--- 237,245 ----
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files manual
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}
  
  %files scripts
***************
*** 272,277 ****
  %attr(0755,root,root) %{_bindir}/*
  
- 
  %changelog
  * Tue Jun 17 2008 Ralph Apel <r.apel at r-apel.de> 0:2.3.0-1.jpp5
  - 2.3.0
--- 247,255 ----
  %attr(0755,root,root) %{_bindir}/*
  
  %changelog
+ * Fri Feb 27 2009 David Walluck <dwalluck at redhat.com> 0:2.3.0-2
+ - spec cleanup
+ - stop xcresolver.zip from downloading
+ 
  * Tue Jun 17 2008 Ralph Apel <r.apel at r-apel.de> 0:2.3.0-1.jpp5
  - 2.3.0




More information about the JPackage-commits mailing list