[Jpackage-commits] dist/plexus-container-default/JPP-6 org-codehaus-plexus-component-info.xml, NONE, 1.1 plexus-container-default.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Jul 9 21:22:43 CEST 2009


Update of /home/projects/jpackage/cvs/dist/plexus-container-default/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv26066

Modified Files:
	plexus-container-default.spec 
Added Files:
	org-codehaus-plexus-component-info.xml 
Log Message:
- add repolib
- fix install


--- NEW FILE: org-codehaus-plexus-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="org/codehaus/plexus"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="plexus-utils.jar"/>
    <artifact id="plexus-container-default.jar"/>


    <export>
      <include input="plexus-container-default.jar"/>
      <include input="plexus-utils.jar"/>

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

Index: plexus-container-default.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-container-default/JPP-6/plexus-container-default.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-container-default.spec	28 May 2008 19:32:17 -0000	1.1
--- plexus-container-default.spec	9 Jul 2009 19:22:40 -0000	1.2
***************
*** 29,39 ****
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! # 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,50 ----
  #
  
! %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_with gcj_support
! %bcond_without maven
! %bcond_without repolib
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
! 
! %define repodir %{_javadir}/repository.jboss.com/org/codehaus/plexus/%{plexus_version}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
  %define section     free
***************
*** 42,55 ****
  %define subname container-default
  %define namedversion 1.0-alpha-9-stable-1
  
  Name:           plexus-container-default
  Version:        1.0
! Release:        0.a9s1.1jpp
  Epoch:          0
  Summary:        Default Plexus Container
! License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://plexus.codehaus.org/
  Source0:        plexus-container-default-%{namedversion}-src.tar.gz
--- 53,65 ----
  %define subname container-default
  %define namedversion 1.0-alpha-9-stable-1
+ %define plexus_version 1.4.8
  
  Name:           plexus-container-default
  Version:        1.0
! Release:        0.a9s1.2%{?dist}
  Epoch:          0
  Summary:        Default Plexus Container
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
  Source0:        plexus-container-default-%{namedversion}-src.tar.gz
***************
*** 59,64 ****
  Source3:        plexus-container-default-settings.xml
  Source4:        plexus-container-default-1.0-jpp-depmap.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %if ! %{gcj_support}
--- 69,75 ----
  Source3:        plexus-container-default-settings.xml
  Source4:        plexus-container-default-1.0-jpp-depmap.xml
+ Source5:        org-codehaus-plexus-component-info.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %if ! %{gcj_support}
***************
*** 70,74 ****
  BuildRequires:  ant-nodeps
  BuildRequires:  junit
! %if %{with_maven}
  BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
--- 81,85 ----
  BuildRequires:  ant-nodeps
  BuildRequires:  junit
! %if %with maven
  BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
***************
*** 81,94 ****
  %endif
  BuildRequires:  classworlds >= 0:1.1
! BuildRequires:  plexus-utils 
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
  %endif
  
  Requires:  classworlds >= 0:1.1
! Requires:  plexus-utils 
  Requires(post):    jpackage-utils >= 0:1.7.3
  Requires(postun):  jpackage-utils >= 0:1.7.3
--- 92,102 ----
  %endif
  BuildRequires:  classworlds >= 0:1.1
! BuildRequires:  plexus-utils  >= 0:%{plexus_version}
  %if %{gcj_support}
  BuildRequires:    java-gcj-compat-devel
  %endif
  
  Requires:  classworlds >= 0:1.1
! Requires:  plexus-utils >= 0:%{plexus_version}
  Requires(post):    jpackage-utils >= 0:1.7.3
  Requires(postun):  jpackage-utils >= 0:1.7.3
***************
*** 112,115 ****
--- 120,134 ----
  Javadoc for %{name}.
  
+ %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 -n plexus-container-default-%{namedversion}
***************
*** 117,125 ****
          mv $j $j.no
  done
! cp %{SOURCE1} build.xml
! cp %{SOURCE2} project.xml
! cp %{SOURCE3} settings.xml
  
- %build
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
--- 136,143 ----
          mv $j $j.no
  done
! cp -p %{SOURCE1} build.xml
! cp -p %{SOURCE2} project.xml
! cp -p %{SOURCE3} settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
***************
*** 134,139 ****
  ln -s %{_javadir} external_repo/JPP
  
! %if %{with_maven}
!     mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
--- 152,158 ----
  ln -s %{_javadir} external_repo/JPP
  
! %build
! %if %with maven
! %{_bindir}/mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
***************
*** 143,153 ****
  
  %else
  mkdir -p target/lib
! build-jar-repository -s -p target/lib \
  classworlds \
  junit \
  plexus/utils
! 
! ant jar javadoc
  %endif
  
--- 162,173 ----
  
  %else
+ export CLASSPATH=
+ export OPT_JAR_LIST=:
  mkdir -p target/lib
! %{_bindir}/build-jar-repository -s -p target/lib \
  classworlds \
  junit \
  plexus/utils
! %{ant} jar javadoc
  %endif
  
***************
*** 155,165 ****
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
  install -pm 644 target/%{name}-%{namedversion}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/plexus/container-default-%{version}.jar
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
! 
! (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # poms
--- 175,185 ----
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
  install -pm 644 target/%{name}-%{namedversion}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{parent}/container-default-%{version}.jar
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
! (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # poms
***************
*** 171,178 ****
  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
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 191,214 ----
  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 0755 %{buildroot}%{repodir}
! %{__install} -d -m 0755 %{buildroot}%{repodirlib}
! %{__install} -p -m 0644 %{SOURCE5} %{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@/%{plexus_version}-brew/g" %{buildroot}%{repodir}/component-info.xml
! %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{SOURCE2} %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{repodirsrc}
! %{__cp} -p %{_javadir}/%{parent}/utils.jar %{buildroot}%{repodirlib}/plexus-utils.jar
! %{__cp} -p %{buildroot}%{_javadir}/plexus/container-default.jar %{buildroot}%{repodirlib}/plexus-container-default.jar
! %endif
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 181,193 ****
  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
--- 217,220 ----
***************
*** 209,227 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/%{parent}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
  %endif
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a9s1.1jpp
  - 1.0-alpha-9-stable-1
--- 236,266 ----
  
  %files
! %defattr(0644,root,root,0755)
! %dir %{_javadir}/%{parent}
! %{_javadir}/%{parent}/container-default-%{version}.jar
! %{_javadir}/%{parent}/container-default.jar
! %{_datadir}/maven2/poms/JPP.plexus-container-default.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
  %endif
  
  %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
+ * Thu Jul 09 2009 David Walluck <dwalluck at redhat.com> 0:1.0-0.a9s1.2
+ - add repolib
+ - fix install
+ 
  * Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a9s1.1jpp
  - 1.0-alpha-9-stable-1
***************
*** 237,239 ****
  * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.1jpp
  - First JPackage build
- 
--- 276,277 ----




More information about the JPackage-commits mailing list