[Jpackage-commits] rpms/free/stax-ex stax-ex.spec,1.5,1.6

jpackage jpackage at ryu.zarb.org
Mon Jul 20 21:13:13 CEST 2009


Update of /home/projects/jpackage/cvs/rpms/free/stax-ex
In directory ryu.zarb.org:/tmp/4yxceVHkR9/rpms/free/stax-ex

Modified Files:
	stax-ex.spec 
Log Message:
1.2-6.jpp6

Index: stax-ex.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/stax-ex/stax-ex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** stax-ex.spec	10 Feb 2009 21:41:49 -0000	1.5
--- stax-ex.spec	20 Jul 2009 19:13:11 -0000	1.6
***************
*** 45,49 ****
  Name:           stax-ex
  Version:        1.2
! Release:	5%{?dist}
  Epoch:          0
  Summary:        STAX extensions
--- 45,49 ----
  Name:           stax-ex
  Version:        1.2
! Release:        6%{?dist}
  Epoch:          0
  Summary:        STAX extensions
***************
*** 59,68 ****
  Source4:        stax-ex-component-info.xml
  Patch0:         stax-ex-pom.patch
! Requires(post): jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  Requires:       java >= 0:1.5.0
  Requires:       jaf_1_1_api
  Requires:       stax_1_0_api
! BuildRequires:  jpackage-utils >= 0:1.7.4
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
--- 59,68 ----
  Source4:        stax-ex-component-info.xml
  Patch0:         stax-ex-pom.patch
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
  Requires:       java >= 0:1.5.0
  Requires:       jaf_1_1_api
  Requires:       stax_1_0_api
! BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
***************
*** 71,74 ****
--- 71,75 ----
  BuildRequires:  javatools-package-rename-task
  %if %with maven
+ BuildRequires:  maven-doxia-sitetools
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
***************
*** 95,103 ****
  3. Improve the namespace support. 
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  %{summary}.
  
--- 96,104 ----
  3. Improve the namespace support. 
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
  %{summary}.
  
***************
*** 129,133 ****
  
  %build
! cd %{name}
  
  %if %with maven
--- 130,134 ----
  
  %build
! cd stax-ex
  
  %if %with maven
***************
*** 148,152 ****
  stax_1_0_api \
  )
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
  %endif
  
--- 149,153 ----
  stax_1_0_api \
  )
! %{ant} -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
  %endif
  
***************
*** 154,167 ****
  rm -rf $RPM_BUILD_ROOT
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 %{name}/target/%{name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{name}/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.jvnet.staxex %{name} %{version} JPP %{name}
  #
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr %{name}/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %if %with repolib
--- 155,168 ----
  rm -rf $RPM_BUILD_ROOT
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 stax-ex/target/stax-ex-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 stax-ex/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.jvnet.staxex %{name} %{version} JPP %{name}
  #
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr stax-ex/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %with repolib
***************
*** 178,182 ****
  %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/mimepull.jar
  %endif
  
--- 179,183 ----
  %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/stax-ex.jar
  %endif
  
***************
*** 192,200 ****
  %files
  %defattr(0644,root,root,0755)
! %doc %{name}/LICENSE.txt
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
--- 193,201 ----
  %files
  %defattr(0644,root,root,0755)
! %doc stax-ex/LICENSE.txt
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 210,213 ****
--- 211,217 ----
  
  %changelog
+ * Mon Jul 20 2009 David Walluck <dwalluck at redhat.com> 0:1.2-6
+ - fix repolib
+ 
  * Tue Feb 10 2009 David Walluck <dwalluck at redhat.com> 0:1.2-5
  - add repolib




More information about the JPackage-commits mailing list