[Jpackage-commits] dist/sun-mimepull/JPP-6 sun-mimepull-component-info.xml, NONE, 1.1 sun-mimepull.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Tue Feb 10 21:32:28 CET 2009


Update of /home/projects/jpackage/cvs/dist/sun-mimepull/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv1894

Modified Files:
	sun-mimepull.spec 
Added Files:
	sun-mimepull-component-info.xml 
Log Message:
- add repolib

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


    <export>
      <include input="mimepull.jar"/>

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

Index: sun-mimepull.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-mimepull/JPP-6/sun-mimepull.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sun-mimepull.spec	28 May 2008 19:59:23 -0000	1.1
--- sun-mimepull.spec	10 Feb 2009 20:32:26 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,32 ****
--- 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 repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/org/jvnet/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
***************
*** 35,53 ****
  Name:           sun-mimepull
  Version:        1.2
! Release:        1jpp
  Epoch:          0
  Summary:        MIME Pull
  License:        CDDL
! Url:            https://mimepull.dev.java.net/
  Source0:        sun-mimepull-%{version}.tar.gz
- # svn export https://mimepull.dev.java.net/svn/mimepull/tags/mimepull-1.2 --username guest sun-mimepull-1.2
  Source1:        sun-mimepull-settings.xml
! 
  Patch0:         sun-mimepull-pom.patch
! 
! Group:          Development/Libraries/Java
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.4
  BuildRequires:  ant >= 0:1.6.5
--- 46,66 ----
  Name:           sun-mimepull
  Version:        1.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        MIME Pull
  License:        CDDL
! Group:          Development/Libraries/Java
! URL:            https://mimepull.dev.java.net/
! # svn -q export https://mimepull.dev.java.net/svn/mimepull/tags/mimepull-1.2 --username guest sun-mimepull-1.2
  Source0:        sun-mimepull-%{version}.tar.gz
  Source1:        sun-mimepull-settings.xml
! Source2:        sun-mimepull-component-info.xml
  Patch0:         sun-mimepull-pom.patch
! Requires(post): jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
! Requires:       jaf_1_1_api
! Requires:       stax_1_0_api
! Requires:       stax-ex
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.4
  BuildRequires:  ant >= 0:1.6.5
***************
*** 66,84 ****
  BuildRequires:  stax-ex
  BuildRequires:  wstx
- Requires:  jaf_1_1_api
- Requires:  stax_1_0_api
- Requires:  stax-ex
- %if ! %{gcj_support}
- BuildArch:      noarch
- %endif
- BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
  %if %{gcj_support}
! BuildRequires:    gnu-crypto
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
  %endif
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  
  %description
--- 79,88 ----
  BuildRequires:  stax-ex
  BuildRequires:  wstx
  %if %{gcj_support}
! BuildRequires: java-gcj-compat-devel
! %else
! BuildArch:      noarch
  %endif
! BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 106,136 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
  %prep
  %setup -q 
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! cp %{SOURCE1} settings.xml
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
  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
  
! %patch0 -b .sav0
  
  %build
- export JAVA_HOME=/usr/lib/jvm/java-1.5.0
  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 \
          -s $M2_SETTINGS \
--- 110,146 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  %{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 
! %patch0 -p0
! cp -p %{SOURCE1} settings.xml
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
  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
  
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
! 
! mv LICENSE LICENSE.org
! %{_bindir}/iconv -f iso8859-1 -t utf8 -o LICENSE LICENSE.org
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL
  export M2_SETTINGS=$(pwd)/settings.xml
  mvn-jpp -e \
          -s $M2_SETTINGS \
***************
*** 140,143 ****
--- 150,154 ----
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
***************
*** 149,166 ****
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
! install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! install -m 644 LICENSE \
!            $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 160,185 ----
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
! %if %with repolib
! %{__install} -d -m 755 %{buildroot}%{repodir}
! %{__install} -d -m 755 %{buildroot}%{repodirlib}
! %{__install} -p -m 644 %{SOURCE2} %{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 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/mimepull.jar
! %endif
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 169,181 ****
  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
--- 188,191 ----
***************
*** 198,208 ****
  %files
  %defattr(0644,root,root,0755)
! %{_docdir}/%{name}-%{version}/LICENSE
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
--- 208,218 ----
  %files
  %defattr(0644,root,root,0755)
! %doc LICENSE
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
***************
*** 211,217 ****
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %changelog
  * Wed Apr 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
  - First release
--- 221,236 ----
  %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-2
+ - add repolib
+ 
  * Wed Apr 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
  - First release




More information about the JPackage-commits mailing list