[Jpackage-commits] rpms/free/kxml2 kxml2.spec,1.2,1.3

jpackage jpackage at ryu.zarb.org
Fri Dec 17 09:24:14 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/kxml2
In directory ryu.zarb.org:/tmp/0ZCDNBrwLS/rpms/free/kxml2

Modified Files:
	kxml2.spec 
Log Message:
2.2.2-4.jpp6

Index: kxml2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/kxml2/kxml2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** kxml2.spec	7 May 2008 15:44:51 -0000	1.2
--- kxml2.spec	17 Dec 2010 08:24:12 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 33,37 ****
  Name:           kxml2
  Version:        2.2.2
! Release:        2jpp
  Epoch:          0
  Summary:        Small XML pull parser specially designed for constrained environments
--- 33,37 ----
  Name:           kxml2
  Version:        2.2.2
! Release:	4%{?dist}
  Epoch:          0
  Summary:        Small XML pull parser specially designed for constrained environments
***************
*** 39,57 ****
  URL:            http://kxml.sourceforge.net/
  Group:          Development/Libraries/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  Source0:        http://dl.sourceforge.net/sourceforge/kxml/kxml2-src-2.2.2.zip
  Source1:        http://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  xpp3 >= 0:1.1.3.1
! Requires:  java >= 0:1.5.0
  Requires:  xpp3
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  
  %description
--- 39,55 ----
  URL:            http://kxml.sourceforge.net/
  Group:          Development/Libraries/Java
  Source0:        http://dl.sourceforge.net/sourceforge/kxml/kxml2-src-2.2.2.zip
  Source1:        http://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  xpp3 >= 0:1.1.3.1
! Requires:  java >= 0:1.6.0
  Requires:  xpp3
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 64,72 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description    javadoc
! Javadoc for %{name}.
  
  %prep
--- 62,68 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description    javadoc
! %{summary}.
  
  %prep
***************
*** 78,82 ****
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
  ant
  
--- 74,77 ----
***************
*** 103,115 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ $1 -eq 0 ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 98,101 ----
***************
*** 121,134 ****
  %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %dir %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}-%{version}/*
! %ghost %dir %{_javadocdir}/%{name}
  
  %changelog
  * Wed May 07 2008 Ralph Apel <r.apel at r-apel.de> 0:2.2.2-2jpp
  - Add xpp3 (B)R
--- 107,124 ----
  %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}*
  
  %changelog
+ * Fri Dec 17 2010 Ralph Apel <r.apel at r-apel.de> 2.2.2-4
+ - Release for JPP-6
+ 
+ * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 2.2.2-3
+ - Auto rebuild for JPackage 5 in mock
+ 
  * Wed May 07 2008 Ralph Apel <r.apel at r-apel.de> 0:2.2.2-2jpp
  - Add xpp3 (B)R




More information about the JPackage-commits mailing list