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

David Walluck david at ryu.zarb.org
Wed Jul 1 00:23:15 CEST 2009


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

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


Index: jboss-cache-core.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-cache-core/devel/jboss-cache-core.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** jboss-cache-core.spec	28 Jun 2009 09:41:04 -0000	1.16
--- jboss-cache-core.spec	30 Jun 2009 22:23:13 -0000	1.17
***************
*** 29,52 ****
  #
  
  %define section free
! %define namedversion 3.1.0.GA
  
  Name:           jboss-cache-core
  Version:        3.1.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss Cache Core
! License:        LGPL
  Group:          Development/Java
  URL:            http://www.jboss.org/
  Source0:        jboss-cache-core-3.1.0.tar.gz
- # svn export http://anonsvn.jboss.org/repos/jbosscache/core/tags/3.1.0.GA/ jboss-cache-core-3.1.0
- 
  Source1:        jboss-cache-core-jpp-depmap.xml
  Source2:        jboss-cache-core-settings.xml
  Source3:        http://repository.jboss.org/maven2/org/jboss/cache/jbosscache-common-parent/1.3/jbosscache-common-parent-1.3.pom
  Source4:        http://repository.jboss.com/maven2/org/jboss/cache/jbosscache-support/1.3/jbosscache-support-1.3.pom
! Source5:        http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
! 
  
  BuildArch:      noarch
--- 29,62 ----
  #
  
+ %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-core/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
! %define reltag GA
! %define namedversion %{version}.%{reltag}
  
  Name:           jboss-cache-core
  Version:        3.1.0
! Release:        2%{?dist}
  Epoch:          0
  Summary:        JBoss Cache Core
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://www.jboss.org/
+ # svn -q export http://anonsvn.jboss.org/repos/jbosscache/core/tags/3.1.0.GA/ jboss-cache-core-3.1.0
  Source0:        jboss-cache-core-3.1.0.tar.gz
  Source1:        jboss-cache-core-jpp-depmap.xml
  Source2:        jboss-cache-core-settings.xml
  Source3:        http://repository.jboss.org/maven2/org/jboss/cache/jbosscache-common-parent/1.3/jbosscache-common-parent-1.3.pom
  Source4:        http://repository.jboss.com/maven2/org/jboss/cache/jbosscache-support/1.3/jbosscache-support-1.3.pom
! Source5:        jboss-cache-core-component-info.xml
  
  BuildArch:      noarch
***************
*** 71,74 ****
--- 81,85 ----
  BuildRequires:  easymock2
  BuildRequires:  hsqldb
+ BuildRequires:  jboss-parent
  BuildRequires:  jbossts
  BuildRequires:  noderunner-http
***************
*** 104,112 ****
  %{summary}.
  
  %prep
  %setup -q 
  
! %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
--- 115,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 
  
! 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
***************
*** 119,130 ****
  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.jboss-jboss-parent.pom
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
--- 140,151 ----
  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
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
***************
*** 133,137 ****
          install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 154,157 ----
***************
*** 141,146 ****
  install -m 644 target/jbosscache-core.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  install -m 644 target/jbosscache-core-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tests-%{version}.jar
  %add_to_maven_depmap org.jboss.cache jbosscache-core %{namedversion} JPP %{name}
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # pom
--- 161,168 ----
  install -m 644 target/jbosscache-core.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  install -m 644 target/jbosscache-core-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tests-%{version}.jar
+ ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jbosscache-core-%{version}.jar
+ ln -s %{name}-tests-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jbosscache-core-tests-%{version}.jar
  %add_to_maven_depmap org.jboss.cache jbosscache-core %{namedversion} JPP %{name}
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # pom
***************
*** 156,160 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 178,200 ----
  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-core-%{version}
! ln -s jbosscache-core-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jbosscache-core
! 
! %if %with repolib
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE5} $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}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/jbosscache-core.jar
! %endif
  
  %clean
***************
*** 169,182 ****
  %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.1.0-1.jpp5
  - 3.1.0.GA
--- 209,243 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/jboss-cache-core-%{version}.jar
! %{_javadir}/jboss-cache-core-tests-%{version}.jar
! %{_javadir}/jboss-cache-core-tests.jar
! %{_javadir}/jboss-cache-core.jar
! %{_javadir}/jbosscache-core-%{version}.jar
! %{_javadir}/jbosscache-core-tests-%{version}.jar
! %{_javadir}/jbosscache-core-tests.jar
! %{_javadir}/jbosscache-core.jar
! %{_datadir}/maven2/poms/JPP-jboss-cache-core.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-core-%{version}
! %{_javadocdir}/jbosscache-core
! 
! %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.1.0-2
+ - add repolib
+ - add compat symlinks
+ 
  * Mon Jun 29 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.1.0-1.jpp5
  - 3.1.0.GA
***************
*** 184,186 ****
  * Mon Jun 15 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.2.0-1.jpp5
  - first release
- 
--- 245,246 ----

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


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

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




More information about the JPackage-commits mailing list