[Jpackage-commits] rpms/free/wsdl4j wsdl4j.spec,1.7,1.8

jpackage jpackage at ryu.zarb.org
Thu Dec 23 11:17:16 CET 2010


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

Modified Files:
	wsdl4j.spec 
Log Message:
1.6.2-7.jpp6

Index: wsdl4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/wsdl4j/wsdl4j.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** wsdl4j.spec	19 Nov 2009 20:42:32 -0000	1.7
--- wsdl4j.spec	23 Dec 2010 10:17:14 -0000	1.8
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 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}}
  
! %bcond_with gcj_support
! %bcond_without repolib
  
! %define repodir %{_javadir}/repository.jboss.com/ibm-wsdl4j/%{version}-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
  %define section         free
--- 29,45 ----
  #
  
! # If you want repolib package to be built,
! # issue the following: 'rpmbuild --with repolib'
  
! %define _with_repolib 1
  
! %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
! %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
! 
! %define repodir %{_javadir}/repository.jboss.com/ibm-wsdl4j/1.6.2-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}}}
  
  %define section         free
***************
*** 52,56 ****
  Name:           wsdl4j
  Version:        1.6.2
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Web Services Description Language Toolkit for Java
--- 48,52 ----
  Name:           wsdl4j
  Version:        1.6.2
! Release:        7%{?dist}
  Epoch:          0
  Summary:        Web Services Description Language Toolkit for Java
***************
*** 58,61 ****
--- 54,60 ----
  License:        CPL
  URL:            http://sourceforge.net/projects/wsdl4j/
+ %if ! %{gcj_support}
+ BuildArch:      noarch
+ %endif
  # cvs -d:pserver:anonymous at wsdl4j.cvs.sourceforge.net:/cvsroot/wsdl4j login 
  # cvs -z3 -d:pserver:anonymous at wsdl4j.cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_6_2 wsdl4j 
***************
*** 63,74 ****
  Source1:        wsdl4j-%{version}.pom
  Source2:        wsdl4j-component-info.xml
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       jaxp_parser_impl
! BuildRequires:  ant >= 0:1.6
! BuildRequires:  ant-junit >= 0:1.6
! BuildRequires:  java-devel
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  junit
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 62,71 ----
  Source1:        wsdl4j-%{version}.pom
  Source2:        wsdl4j-component-info.xml
! BuildRequires:  ant >= 0:1.7.1
! BuildRequires:  ant-junit
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  junit
+ Requires:  java >= 0:1.6.0
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 91,98 ****
  Javadoc for %{name}.
  
! %if %with repolib
  %package repolib
! Summary:        Artifacts to be uploaded to a repository library
! Group:          Development/Libraries/Java
  
  %description repolib
--- 88,95 ----
  Javadoc for %{name}.
  
! %if %{with_repolib}
  %package repolib
! Summary:         Artifacts to be uploaded to a repository library
! Group:           Development/Libraries/Java
  
  %description repolib
***************
*** 103,107 ****
  
  %prep
! %setup -q -n wsdl4j
  find . -name '*.jar' | xargs -t %{__rm}
  
--- 100,104 ----
  
  %prep
! %setup -q -n %{name}
  find . -name '*.jar' | xargs -t %{__rm}
  
***************
*** 111,116 ****
  %build
  export CLASSPATH=
! export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
! %{ant} -Ddebug=true -Dbuild.compiler=modern compile test javadocs
  
  %install
--- 108,113 ----
  %build
  export CLASSPATH=
! export OPT_JAR_LIST="ant/ant-junit junit"
! ant -Ddebug=true -Dbuild.compiler=modern compile test javadocs
  
  %install
***************
*** 120,132 ****
  install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
  
! install -p -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -p -m 644 build/lib/qname.jar $RPM_BUILD_ROOT%{_javadir}/wsdl-qname-%{version}.jar
! touch $RPM_BUILD_ROOT%{_javadir}/qname.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar | sed "s|-%{version}||g"`; done)
  
  # 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 wsdl4j wsdl4j %{version} JPP %{name}
  
  # javadoc
--- 117,134 ----
  install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
  
! install -m 644 build/lib/%{name}.jar \
!       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -m 644 build/lib/qname.jar \
!       $RPM_BUILD_ROOT%{_javadir}/wsdl-qname-%{version}.jar
! touch $RPM_BUILD_ROOT%{_javadir}/qname.jar # for %ghost
! 
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! 
! %add_to_maven_depmap wsdl4j wsdl4j %{version} JPP wsdl4j
  
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 %{SOURCE1} \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.wsdl4j.pom
  
  # javadoc
***************
*** 135,149 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
! %if %with repolib
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
! %{__sed} -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! %{__sed} -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/wsdl4j.jar
! cp -p tmpsrc/%{name}-src.jar $RPM_BUILD_ROOT%{repodirlib}/
  %endif
  
--- 137,151 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
! %if %{with_repolib}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodir}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
!         install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
!         sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
!         install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
!         cp -p $RPM_BUILD_ROOT%{_javadir}/wsdl4j.jar $RPM_BUILD_ROOT%{repodirlib}
!         cp -p tmpsrc/%{name}-src.jar $RPM_BUILD_ROOT%{repodirlib}
  %endif
  
***************
*** 156,160 ****
  
  %post
! %{_sbindir}/update-alternatives --install %{_javadir}/qname.jar qname %{_javadir}/wsdl4j-qname.jar 00100
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 158,163 ----
  
  %post
! %update_maven_depmap
! %{_sbindir}/update-alternatives --install %{_javadir}/qname.jar qname %{_javadir}/wsdl-qname.jar 00100
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 163,173 ****
  fi
  %endif
- %update_maven_depmap
  
  %postun
- %update_maven_depmap
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove qname %{_javadir}/wsdl4j-qname.jar
  fi
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 166,175 ----
  fi
  %endif
  
  %postun
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove qname %{_javadir}/wsdl-qname.jar
  fi
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 180,190 ****
  %defattr(0644,root,root,0755)
  %doc license.html
! %{_javadir}/qname.jar
  %{_javadir}/wsdl-qname-%{version}.jar
  %{_javadir}/wsdl-qname.jar
  %{_javadir}/wsdl4j-%{version}.jar
  %{_javadir}/wsdl4j.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 182,193 ----
  %defattr(0644,root,root,0755)
  %doc license.html
! %ghost %{_javadir}/qname.jar
  %{_javadir}/wsdl-qname-%{version}.jar
  %{_javadir}/wsdl-qname.jar
+ %{_javadir}/wsdl-qname.jar
  %{_javadir}/wsdl4j-%{version}.jar
  %{_javadir}/wsdl4j.jar
! %{_datadir}/maven2/poms/*
! %config(noreplace) %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 198,202 ****
  %{_javadocdir}/%{name}
  
! %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
--- 201,205 ----
  %{_javadocdir}/%{name}
  
! %if %{with_repolib}
  %files repolib
  %defattr(0644,root,root,0755)
***************
*** 205,214 ****
  
  %changelog
  * Thu Nov 19 2009 David Walluck <dwalluck at redhat.com> 0:1.6.2-5
  - fix component-info.xml
  
! * Mon Nov 16 2009 David Walluck <dwalluck at redhat.com> 0:1.6.2-4
! - fix pom name
! - fix repolib directory ownership
  
  * Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.2-3.jpp5
--- 208,226 ----
  
  %changelog
+ * Wed Dec 22 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.2-7
+ - First JPP-6 release
+ - Dropped jaxp_parser_impl (B)R
+ 
  * Thu Nov 19 2009 David Walluck <dwalluck at redhat.com> 0:1.6.2-5
  - fix component-info.xml
  
! * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 1.6.2-5
! - Auto rebuild for JPackage 5 in mock
! 
! * Wed Nov 19 2008 David Walluck <dwalluck at redhat.com> 0:1.6.2-4
! - fix file list
! - fix repolib
! - fix component-info.xml
! - fix GCJ support
  
  * Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.2-3.jpp5




More information about the JPackage-commits mailing list