[Jpackage-commits] dist/jboss-cache-pojo/devel jboss-cache-pojo-component-info.xml, NONE, 1.1 jboss-cache-pojo.spec, 1.17, 1.18

David Walluck david at ryu.zarb.org
Wed Jul 1 02:00:42 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jboss-cache-pojo/devel
In directory ryu.zarb.org:/tmp/cvs-serv24871

Modified Files:
	jboss-cache-pojo.spec 
Added Files:
	jboss-cache-pojo-component-info.xml 
Log Message:
- add repolib

--- NEW FILE: jboss-cache-pojo-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="jboss/cache/jbosscache-pojo"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="jbosscache-pojo.jar"/>


    <export>
      <include input="jbosscache-pojo.jar"/>

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

Index: jboss-cache-pojo.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-cache-pojo/devel/jboss-cache-pojo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** jboss-cache-pojo.spec	28 Jun 2009 13:54:19 -0000	1.17
--- jboss-cache-pojo.spec	1 Jul 2009 00:00:40 -0000	1.18
***************
*** 29,46 ****
  #
  
  %define section free
! %define namedversion 3.0.0.GA
  
  Name:           jboss-cache-pojo
  Version:        3.0.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss Cache Pojo
! License:        LGPL
  Group:          Development/Java
  URL:            http://www.jboss.org/
  Source0:        jboss-cache-pojo-3.0.0.tar.gz
- # svn export http://anonsvn.jboss.org/repos/jbosscache/pojo/tags/3.0.0.GA/ jboss-cache-pojo-3.0.0
- 
  Source1:        jboss-cache-pojo-jpp-depmap.xml
  Source2:        jboss-cache-pojo-settings.xml
--- 29,57 ----
  #
  
+ %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/jboss/cache/jbosscache-pojo/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
! %define reltag GA
! %define namedversion %{version}.%{reltag}
  
  Name:           jboss-cache-pojo
  Version:        3.0.0
! Release:        2%{?dist}
  Epoch:          0
  Summary:        JBoss Cache Pojo
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://www.jboss.org/
+ # svn -q export http://anonsvn.jboss.org/repos/jbosscache/pojo/tags/3.0.0.GA/ jboss-cache-pojo-3.0.0
  Source0:        jboss-cache-pojo-3.0.0.tar.gz
  Source1:        jboss-cache-pojo-jpp-depmap.xml
  Source2:        jboss-cache-pojo-settings.xml
***************
*** 54,57 ****
--- 65,69 ----
  Source14:       http://repository.jboss.com/maven2/org/eclipse/wst/css/core/1.1.101-v200705302225/core-1.1.101-v200705302225.pom
  Source15:       http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
+ Source16:       jboss-cache-pojo-component-info.xml
  
  Patch0:         jboss-cache-pojo-pom.patch
***************
*** 102,111 ****
  %{summary}.
  
  %prep
  %setup -q 
! %patch0 -b .sav0
  
! %build
! cp %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
--- 114,133 ----
  %{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
  
! cp -p %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 118,135 ****
  ln -s %{_javadir} external_repo/JPP
  
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
! cp %{SOURCE3} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss.cache-jbosscache-common-parent.pom
! cp %{SOURCE4} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss.cache-jbosscache-support.pom
! cp %{SOURCE5} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.richfaces-docs.pom
! cp %{SOURCE6} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.richfaces-root.pom
! cp %{SOURCE15} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss-jboss-parent.pom
  mkdir -p m2_repo/repository/org.eclipse.wst.sse/
! cp %{SOURCE11} m2_repo/repository/org.eclipse.wst.sse/core.jar
  mkdir -p m2_repo/repository/org.eclipse.wst.css/
! cp %{SOURCE13} m2_repo/repository/org.eclipse.wst.css/core.jar
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
--- 140,157 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
! cp -p %{SOURCE3} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss.cache-jbosscache-common-parent.pom
! cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss.cache-jbosscache-support.pom
! cp -p %{SOURCE5} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.richfaces-docs.pom
! cp -p %{SOURCE6} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.richfaces-root.pom
  mkdir -p m2_repo/repository/org.eclipse.wst.sse/
! cp -p %{SOURCE11} m2_repo/repository/org.eclipse.wst.sse/core.jar
  mkdir -p m2_repo/repository/org.eclipse.wst.css/
! cp -p %{SOURCE13} m2_repo/repository/org.eclipse.wst.css/core.jar
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
***************
*** 138,142 ****
          install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 160,163 ----
***************
*** 145,148 ****
--- 166,170 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  install -m 644 target/jbosscache-pojo.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jbosscache-pojo-%{version}.jar
  %add_to_maven_depmap org.jboss.cache jbosscache-pojo %{namedversion} JPP %{name}
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 160,164 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 182,212 ----
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jbosscache-pojo-%{version}
! ln -s jbosscache-pojo-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jbosscache-pojo
! 
! %if %with repolib
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i 's/@VERSION@/%{version}.%{reltag}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/jbosscache-pojo.jar
! %endif
  
  %clean
***************
*** 173,186 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Jun 29 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.0.0-1.jpp5
  - 3.0.0.GA
--- 221,250 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/jbosscache-pojo-%{version}.jar
! %{_javadir}/jbosscache-pojo.jar
! %{_datadir}/maven2/poms/JPP-jboss-cache-pojo.pom
! %{_datadir}/maven2/poms/JPP-jbosscache-common-parent.pom
! %{_datadir}/maven2/poms/JPP-jbosscache-support.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! %{_javadocdir}/jbosscache-pojo-%{version}
! %{_javadocdir}/jbosscache-pojo
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Tue Jun 30 2009 David Walluck <dwalluck at redhat.com> 0:3.0.0-2
+ - add repolib
+ 
  * Mon Jun 29 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.0.0-1.jpp5
  - 3.0.0.GA
***************
*** 188,190 ****
  * Tue Jun 16 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.2.0-1.jpp5
  - first release
- 
--- 252,253 ----




More information about the JPackage-commits mailing list