[Jpackage-commits] rpms/free/annogen annogen.spec,1.2.2.1,1.2.2.2

jpackage jpackage at ryu.zarb.org
Sun Feb 1 14:46:29 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/annogen
In directory ryu.zarb.org:/tmp/1FfDkq0BJZ/rpms/free/annogen

Modified Files:
      Tag: JPACKAGE-5_0
	annogen.spec 
Log Message:
0.1.1-8.jpp5

Index: annogen.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/annogen/annogen.spec,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** annogen.spec	8 Dec 2008 15:16:17 -0000	1.2.2.1
--- annogen.spec	1 Feb 2009 13:46:27 -0000	1.2.2.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 37,41 ****
  Summary:        Framework to help work with JSR175 Annotations
  Version:        0.1.1
! Release:	7%{?dist}
  Epoch:          0
  URL:            http://annogen.codehaus.org/
--- 37,41 ----
  Summary:        Framework to help work with JSR175 Annotations
  Version:        0.1.1
! Release:	8%{?dist}
  Epoch:          0
  URL:            http://annogen.codehaus.org/
***************
*** 47,52 ****
  Patch0:         annogen-build-jam-test.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
--- 47,52 ----
  Patch0:         annogen-build-jam-test.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
***************
*** 71,76 ****
  BuildArch:      noarch
  
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  
  %description
--- 71,76 ----
  BuildArch:      noarch
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 83,87 ****
  
  %description javadoc
! Javadoc for %{name}.
  
  %prep
--- 83,87 ----
  
  %description javadoc
! %{summary}.
  
  %prep
***************
*** 110,114 ****
  %build
  unset CLASSPATH
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
  ant distribution test jam.test
  
--- 110,114 ----
  %build
  unset CLASSPATH
! 
  ant distribution test jam.test
  
***************
*** 136,148 ****
  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
--- 136,139 ----
***************
*** 154,166 ****
  %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 0.1.1-7
  - Auto rebuild for JPackage 5 in mock
--- 145,162 ----
  %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Mon Jan 12 2009 Ralph Apel <r.apel at r-apel.de> 0.1.1-8
+ - Relax java-devel BR to >= 1.5.0
+ - Drop -javadoc ghost
+ - Disown poms and depmap frag dirs
+ 
  * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 0.1.1-7
  - Auto rebuild for JPackage 5 in mock




More information about the JPackage-commits mailing list