[Jpackage-commits] dist/log4j/JPP-5 log4j.spec,1.3,1.4

jpackage jpackage at ryu.zarb.org
Sun Feb 8 17:27:52 CET 2009


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

Modified Files:
	log4j.spec 
Log Message:
1.2.14-14

Index: log4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/log4j/JPP-5/log4j.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** log4j.spec	5 Dec 2008 20:01:55 -0000	1.3
--- log4j.spec	8 Feb 2009 16:27:50 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 48,52 ****
  Name:           log4j
  Version:        1.2.14
! Release:        13%{?dist}
  Epoch:          0
  Summary:        Java logging package
--- 48,52 ----
  Name:           log4j
  Version:        1.2.14
! Release:        14%{?dist}
  Epoch:          0
  Summary:        Java logging package
***************
*** 65,68 ****
--- 65,69 ----
  Source7:        %{name}.catalog
  Source8:        log4j-component-info.xml
+ Source9:        http://repo1.maven.org/maven2/log4j/log4j/1.2.14/log4j-1.2.14.pom
  Patch0:         %{name}-logfactor5-userdir.patch
  Patch1:         %{name}-javadoc-xlink.patch
***************
*** 71,75 ****
  Patch2:         %{name}-mx4j-tools.patch
  Patch3:         %{name}-jmx-Agent.patch
! BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant
  %if ! %{bootstrap}
--- 72,77 ----
  Patch2:         %{name}-mx4j-tools.patch
  Patch3:         %{name}-jmx-Agent.patch
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant
  %if ! %{bootstrap}
***************
*** 81,87 ****
  BuildRequires:  jndi
  BuildRequires:  java-javadoc
! Requires:       jpackage-utils >= 0:1.6
! Requires:       xml-commons-apis
! Requires:       jaxp_parser_impl
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 83,93 ----
  BuildRequires:  jndi
  BuildRequires:  java-javadoc
! Requires:       jpackage-utils >= 0:1.7.2
! Requires:       java >= 0:1.5.0
! #Requires:       xml-commons-apis
! #Requires:       jaxp_parser_impl
! Requires(post):   jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
! 
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 161,164 ****
--- 167,175 ----
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
+ # poms
+ %__mkdir_p %{buildroot}%{_datadir}/maven2/poms
+ %__cp -a %{SOURCE9} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+ 
  # javadoc
  %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
***************
*** 217,220 ****
--- 228,232 ----
  
  %post
+ %update_maven_depmap
  /bin/touch %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat 2>/dev/null
  # Note that we're using versioned catalog, so this is always ok.
***************
*** 253,256 ****
--- 265,269 ----
  
  %postun
+ %update_maven_depmap
  # Note that we're using versioned catalog, so this is always ok.
  if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
***************
*** 274,277 ****
--- 287,292 ----
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
  %{_datadir}/applications/*chainsaw.desktop
  %{_datadir}/applications/*logfactor5.desktop
***************
*** 302,305 ****
--- 317,326 ----
  
  %changelog
+ * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:1.2.14-14
+ - Add pom and depmap frag
+ - Omit xml-commons-apis, jaxp_parser_impl Requires
+ - (B)R, post, postun jpackage-utils >= 0:1.7.2
+ - BR java-devel >= 0:1.5.0, R java >= 0:1.5.0
+ 
  * Fri Dec 05 2008 David Walluck <dwalluck at redhat.com> 0:1.2.14-13
  - fix repolib file ownership




More information about the JPackage-commits mailing list