[Jpackage-commits] rpms/free/stax-ex stax-ex-component-info.xml, NONE, 1.1 stax-ex.spec, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Tue Feb 10 22:41:51 CET 2009


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

Modified Files:
	stax-ex.spec 
Added Files:
	stax-ex-component-info.xml 
Log Message:
1.2-5.jpp6

--- NEW FILE: stax-ex-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="org/jvnet/staxex"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="stax-ex.jar"/>


    <export>
      <include input="stax-ex.jar"/>

    </export>
  </component>
</project>

Index: stax-ex.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/stax-ex/stax-ex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** stax-ex.spec	10 Oct 2008 19:38:03 -0000	1.4
--- stax-ex.spec	10 Feb 2009 21:41:49 -0000	1.5
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,37 ****
  #
  
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
  
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define section   free
--- 29,43 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without maven
! %bcond_without repolib
! 
! %define repodir %{_javadir}/repository.jboss.com/org/jvnet/staxex/%{version}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
  %define section   free
***************
*** 39,43 ****
  Name:           stax-ex
  Version:        1.2
! Release:        3%{?dist}
  Epoch:          0
  Summary:        STAX extensions
--- 45,49 ----
  Name:           stax-ex
  Version:        1.2
! Release:	5%{?dist}
  Epoch:          0
  Summary:        STAX extensions
***************
*** 51,55 ****
--- 57,67 ----
  Source2:        %{name}-%{version}-autogenerated-files.tar.gz
  Source3:        %{name}-jpp-depmap.xml
+ 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
***************
*** 58,62 ****
  BuildRequires:  junit
  BuildRequires:  javatools-package-rename-task
! %if %{with_maven}
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
--- 70,74 ----
  BuildRequires:  junit
  BuildRequires:  javatools-package-rename-task
! %if %with maven
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
***************
*** 71,79 ****
  BuildRequires:  geronimo-stax-1.0-api
  #BuildRequires:  stax_1_0_api
- 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
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 83,86 ----
***************
*** 95,98 ****
--- 102,116 ----
  %{summary}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
  %setup -q 
***************
*** 103,120 ****
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
! %if %{without_maven}
! gzip -dc %{SOURCE2} | tar xf -
  %endif
  
  %build
  cd %{name}
  
! %if %{with_maven}
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL
- 
- mkdir external_repo
- ln -s %{_javadir} external_repo/JPP
- 
  export M2_SETTINGS=$(pwd)/settings.xml
  mvn-jpp -e \
--- 121,137 ----
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
! %if %without maven
! %setup -q -T -D -a 2
  %endif
  
+ mkdir external_repo
+ ln -s %{_javadir} external_repo/JPP
+ 
  %build
  cd %{name}
  
! %if %with maven
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL
  export M2_SETTINGS=$(pwd)/settings.xml
  mvn-jpp -e \
***************
*** 148,151 ****
--- 165,184 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE4} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
+ %{__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
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 166,174 ****
  
  %files javadoc
! %defattr(-,root,root,-)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
  * Fri Oct 10 2008 David Walluck <dwalluck at redhat.com> 0:1.2-3
  - fix changelog
--- 199,219 ----
  
  %files javadoc
! %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Tue Feb 10 2009 David Walluck <dwalluck at redhat.com> 0:1.2-5
+ - add repolib
+ 
+ * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 1.2-4
+ - Auto rebuild for JPackage 5 in mock
+ 
  * Fri Oct 10 2008 David Walluck <dwalluck at redhat.com> 0:1.2-3
  - fix changelog




More information about the JPackage-commits mailing list