[Jpackage-commits] rpms/devel/jboss-ejb3-cache jboss-ejb3-build-1.0.0.pom, 1.1, NONE jboss-ejb3-cache-component-info.xml, NONE, 1.1 jboss-ejb3-cache.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Tue Jul 21 20:55:32 CEST 2009


Update of /home/projects/jpackage/cvs/rpms/devel/jboss-ejb3-cache
In directory ryu.zarb.org:/tmp/CGHCrb5ND5/rpms/devel/jboss-ejb3-cache

Modified Files:
	jboss-ejb3-cache.spec 
Added Files:
	jboss-ejb3-cache-component-info.xml 
Removed Files:
	jboss-ejb3-build-1.0.0.pom 
Log Message:
1.0.0-3.jpp6

--- jboss-ejb3-build-1.0.0.pom DELETED ---

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


    <export>
      <include input="jboss-ejb3-cache.jar"/>

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

Index: jboss-ejb3-cache.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/devel/jboss-ejb3-cache/jboss-ejb3-cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jboss-ejb3-cache.spec	3 Jul 2009 18:18:13 -0000	1.1
--- jboss-ejb3-cache.spec	21 Jul 2009 18:55:30 -0000	1.2
***************
*** 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/jboss/jboss-ejb3-cache/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
  %define namedversion 1.0.0
***************
*** 34,51 ****
  Name:           jboss-ejb3-cache
  Version:        1.0.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss EJB3 Cache
! License:        LGPL
  Group:          Development/Java
  URL:            http://www.jboss.org/
  Source0:        jboss-ejb3-cache-1.0.0.tar.gz
- # svn export http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-cache-1.0.0/
- 
  Source1:        jboss-ejb3-cache-jpp-depmap.xml
  Source2:        jboss-ejb3-cache-settings.xml
! Source3:        jboss-ejb3-build-1.0.0.pom
! Source4:        http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
! 
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
--- 45,61 ----
  Name:           jboss-ejb3-cache
  Version:        1.0.0
! Release:        3%{?dist}
  Epoch:          0
  Summary:        JBoss EJB3 Cache
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://www.jboss.org/
+ # svn -q export http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-cache-1.0.0/
  Source0:        jboss-ejb3-cache-1.0.0.tar.gz
  Source1:        jboss-ejb3-cache-jpp-depmap.xml
  Source2:        jboss-ejb3-cache-settings.xml
! #Source3:        jboss-ejb3-build-1.0.0.pom
! Source4:        jboss-ejb3-cache-component-info.xml
! Source5:        http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
***************
*** 73,76 ****
--- 83,87 ----
  BuildRequires:  jboss-common-core
  BuildRequires:  jboss-common-logging-log4j
+ BuildRequires:  jboss-ejb3-build
  BuildRequires:  jboss-ejb-3.0-api
  BuildRequires:  jboss-serialization
***************
*** 81,84 ****
--- 92,96 ----
  Requires:  jboss-common-core
  Requires:  jboss-common-logging-log4j
+ Requires:  jboss-ejb3-build
  Requires:  jboss-ejb-3.0-api
  Requires:  jboss-serialization
***************
*** 95,103 ****
  %{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
--- 107,125 ----
  %{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
***************
*** 110,120 ****
  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.ejb3-jboss-ejb3-build.pom
! cp %{SOURCE4} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss-jboss-parent.pom
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
--- 132,143 ----
  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.ejb3-jboss-ejb3-build.pom
! cp %{SOURCE5} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss-jboss-parent.pom
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
***************
*** 127,131 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/jboss-ejb3-cache.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap org.jboss.ejb3 jboss-ejb3-cache %{namedversion} JPP %{name}
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
--- 150,154 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 target/jboss-ejb3-cache.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap org.jboss.ejb3 jboss-ejb3-cache %{namedversion} JPP %{name}
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 133,139 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! %add_to_maven_depmap org.jboss.ejb3 jboss-ejb3-build 1.0.0 JPP jboss-ejb3-build
! install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-jboss-ejb3-build.pom
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
--- 156,162 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! #%add_to_maven_depmap org.jboss.ejb3 jboss-ejb3-build 1.0.0 JPP jboss-ejb3-build
! #install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-jboss-ejb3-build.pom
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
***************
*** 141,145 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 164,183 ----
  cp -rf 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 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i 's/@VERSION@/%{version}-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}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/jboss-ejb3-cache.jar
! %endif
  
  %clean
***************
*** 154,168 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Jul 03 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0.0-1.jpp5
  - first release
- 
--- 192,219 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  
  %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 Jul 21 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0.0-3
+ - replace jboss-ejb3-build.pom with (B)R jboss-ejb3-build
+ - add jboss-parent.pom for build
+ 
+ * Thu Jul 09 2009 David Walluck <dwalluck at redhat.com> 0:1.0.0-2
+ - add repolib
+ 
  * Fri Jul 03 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0.0-1.jpp5
  - first release




More information about the JPackage-commits mailing list