[Jpackage-commits] rpms/free/ant-contrib ant-contrib.spec, 1.3, 1.3.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 1 15:17:15 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/ant-contrib
In directory ryu.zarb.org:/tmp/X3AWl5pbyu/rpms/free/ant-contrib

Modified Files:
      Tag: JPACKAGE-5_0
	ant-contrib.spec 
Log Message:
1.0-0.b3.2.jpp5

Index: ant-contrib.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/ant-contrib/ant-contrib.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** ant-contrib.spec	7 Jul 2008 09:03:51 -0000	1.3
--- ant-contrib.spec	1 Feb 2009 14:17:12 -0000	1.3.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 36,46 ****
  Name:           ant-contrib
  Version:        1.0
! Release:        0.b3.1%{dist}
  Epoch:          0
  License:        Apache Software License
  URL:            http://ant-contrib.sourceforge.net/
  Group:          Development/Libraries/Java
- #Vendor:         JPackage Project
- #Distribution:   JPackage
  Source0:        http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-1.0b3-src.tar.gz
  Source1:        ant-contrib-1.0b3.pom
--- 36,44 ----
  Name:           ant-contrib
  Version:        1.0
! Release:        0.b3.2%{dist}
  Epoch:          0
  License:        Apache Software License
  URL:            http://ant-contrib.sourceforge.net/
  Group:          Development/Libraries/Java
  Source0:        http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-1.0b3-src.tar.gz
  Source1:        ant-contrib-1.0b3.pom
***************
*** 48,52 ****
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
--- 46,50 ----
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
***************
*** 92,97 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description    javadoc
--- 90,93 ----
***************
*** 124,128 ****
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
  ant
  ant test
--- 120,123 ----
***************
*** 159,171 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 154,157 ----
***************
*** 190,195 ****
  %{_javadir}/*.jar
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 176,181 ----
  %{_javadir}/*.jar
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 201,205 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %files manual
--- 187,191 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %files manual
***************
*** 208,211 ****
--- 194,202 ----
  
  %changelog
+ * Mon Jan 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2.jpp5
+ - Relax java-devel BR to >= 1.5.0
+ - Drop -javadoc ghost and post/postun
+ - Disown poms and depmap frags dirs
+ 
  * Sat Jul 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.1.jpp5
  - 1.0b3




More information about the JPackage-commits mailing list