[Jpackage-commits] dist/ws-commons-neethi/JPP-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ws-commons-neethi.spec, 1.4, 1.5

David Walluck david at ryu.zarb.org
Tue Jul 28 17:17:23 CEST 2009


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

Modified Files:
	.cvsignore sources ws-commons-neethi.spec 
Log Message:
- 2.0.4

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	23 Jul 2008 15:42:41 -0000	1.2
--- .cvsignore	28 Jul 2009 15:17:21 -0000	1.3
***************
*** 1 ****
! neethi-2.0.1.tar.gz
--- 1 ----
! neethi-2.0.4.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	23 Jul 2008 15:42:41 -0000	1.2
--- sources	28 Jul 2009 15:17:21 -0000	1.3
***************
*** 1 ****
! 18461e672396d2620b6b20ab9bac8b97  neethi-2.0.1.tar.gz
--- 1 ----
! 6517f65578ec563079e9ed11a8459659  neethi-2.0.4.tar.bz2

Index: ws-commons-neethi.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-commons-neethi/JPP-6/ws-commons-neethi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** ws-commons-neethi.spec	23 Mar 2009 19:26:07 -0000	1.4
--- ws-commons-neethi.spec	28 Jul 2009 15:17:21 -0000	1.5
***************
*** 27,39 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
! %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 with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define section     free
--- 27,44 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %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 maven
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
  %define section     free
***************
*** 41,59 ****
  
  Name:           ws-commons-neethi
! Version:        2.0.1
! Release:        4%{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
--- 46,58 ----
  
  Name:           ws-commons-neethi
! Version:        2.0.4
! Release:        1%{dist}
  Epoch:          0
  Summary:        Apache Neethi WS-Policy implementation 
! License:        ASL 2.0
  Group:          Text Processing/Markup/XML
! URL:            http://ws.apache.org/commons/neethi/index.html
! # svn -q export http://svn.apache.org/repos/asf/webservices/commons/tags/neethi/2.0.4/ neethi && tar cjf neethi-2.0.4.tar.bz2 neethi
! Source0:        %{short_name}-%{version}.tar.bz2
  Source1:        %{name}-setting.xml
  Source2:        %{name}-jpp-depmap.xml
***************
*** 61,71 ****
  Patch0:         %{name}-pom_xml.patch
  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
--- 60,71 ----
  Patch0:         %{name}-pom_xml.patch
  Patch1:         %{name}-site_xml.patch
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
! BuildRequires:  ant >= 0:1.6
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jdepend
! BuildRequires:  junit >= 0:3.8.2
! %if %with maven
  BuildRequires:  maven2 >= 2.0.7
  BuildRequires:  maven2-plugin-antrun
***************
*** 86,91 ****
  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:    java-gcj-compat-devel
--- 86,89 ----
***************
*** 107,115 ****
  Requires:       wsdl4j >= 0:1.6.2
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
  
  %description
--- 105,115 ----
  Requires:       wsdl4j >= 0:1.6.2
  
+ # ws-commons-policy has NOT been renamed to neethi
+ Provides:   neethi = %{epoch}:%{version}-%{release}
+ Obsoletes:  neethi <= 0:1.0.1
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 129,139 ****
  %prep
  %setup -q -n %{short_name}
! cp %{SOURCE1} settings.xml
! cp %{SOURCE3} build.xml
! %patch0 -b .sav
! %patch1 -b .sav
  
  %build
! %if %{with_maven}
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
--- 129,139 ----
  %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
! %if %with maven
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
***************
*** 156,159 ****
--- 156,160 ----
          install javadoc:javadoc site
  %else
+ export OPT_JAR_LIST=
  export CLASSPATH=$(build-classpath \
  stax_1_0_api \
***************
*** 163,173 ****
  )
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! ant -Dbuild.sysclasspath=only jar test javadoc
  %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/%{short_name}-%{version}.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap org.apache.neethi neethi %{version} JPP %{name}
--- 164,175 ----
  )
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! %{ant} -Dbuild.sysclasspath=only jar test javadoc
  %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 target/%{short_name}-%{version}.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap org.apache.neethi neethi %{version} JPP %{name}
***************
*** 180,186 ****
  
  # poms
! %if %{with_maven}
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  %endif
--- 182,188 ----
  
  # poms
! %if %with maven
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  %endif
***************
*** 190,199 ****
  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
  
--- 192,201 ----
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! %if %with maven
! cp -pr target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/apidocs
  %endif
  
***************
*** 225,235 ****
  %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
--- 227,237 ----
  %files
  %defattr(0644,root,root,0755)
  %dir %{_docdir}/%{name}-%{version}
+ %doc %{_docdir}/%{name}-%{version}/*
  %{_javadir}/*.jar
! %{_datadir}/maven2/poms/JPP.%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
  %endif
***************
*** 237,244 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Mar 23 2009 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-4.jpp5
  - (B)R wstx32 because wstx is frozen to 3.1.1 in JPP-5
--- 239,249 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Tue Jul 28 2009 David Walluck <dwalluck at redhat.com> 0:2.0.4-1
+ - 2.0.4
+ 
  * Mon Mar 23 2009 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-4.jpp5
  - (B)R wstx32 because wstx is frozen to 3.1.1 in JPP-5




More information about the JPackage-commits mailing list