[Jpackage-commits] dist/jboss-common-core/JPP-6 jboss-common-core-2.2.10-jpp-depmap.xml, NONE, 1.1 jboss-common-core-2.2.8-jpp-depmap.xml, 1.1, NONE jboss-common-core-component-info.xml, NONE, 1.1 jboss-common-core.spec, 1.1, 1.2 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Mon Feb 9 21:58:32 CET 2009


Update of /home/projects/jpackage/cvs/dist/jboss-common-core/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv15572

Modified Files:
	jboss-common-core.spec sources 
Added Files:
	jboss-common-core-2.2.10-jpp-depmap.xml 
	jboss-common-core-component-info.xml 
Removed Files:
	jboss-common-core-2.2.8-jpp-depmap.xml 
Log Message:
- 2.2.10.GA
- add repolib


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common-core/JPP-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	6 Feb 2009 17:56:59 -0000	1.1
--- sources	9 Feb 2009 20:58:30 -0000	1.2
***************
*** 1 ****
! 4d7cbf669c29a217663174bbe921e08f  jboss-common-core-2.2.8.tar.gz
--- 1 ----
! 8ee6a6469b6eac02c9a2f9c418311869  jboss-common-core-2.2.10.tar.bz2

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


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

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

Index: jboss-common-core.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common-core/JPP-6/jboss-common-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jboss-common-core.spec	6 Feb 2009 17:56:58 -0000	1.1
--- jboss-common-core.spec	9 Feb 2009 20:58:30 -0000	1.2
***************
*** 29,52 ****
  #
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section   free
! %define namedversion   2.2.8.GA
  
  Name:           jboss-common-core
! Version:        2.2.8
! Release:        1%{dist}
  Epoch:          0
  Summary:        JBoss Common core utility classes
  License:        LGPLv2+
! Url:            http://www.jboss.org/
  Group:          Development/Libraries/Java
! Source0:        %{name}-%{version}.tar.gz
! # svn export http://anonsvn.jboss.org/repos/common/common-core/tags/2.2.8.GA/ jboss-commons-core-2.2.8
  Source1:        %{name}-settings.xml
  Source2:        %{name}-%{version}-jpp-depmap.xml
! Source3:        jboss-parent-3.pom 
! ## get it from http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/jboss-parent/tags/jboss-parent-3/pom.xml
! 
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.5.0
--- 29,64 ----
  #
  
+ %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 repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/sun-jaxb/%{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}}}
  
  %define section   free
! %define namedversion   %{version}.GA
  
  Name:           jboss-common-core
! Version:        2.2.10
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss Common core utility classes
  License:        LGPLv2+
! URL:            http://www.jboss.org/
  Group:          Development/Libraries/Java
! # svn -q export http://anonsvn.jboss.org/repos/common/common-core/tags/2.2.10.GA/ jboss-common-core-2.2.10 && tar cjf jboss-common-core-2.2.10.tar.bz2 jboss-common-core-2.2.10
! Source0:        %{name}-%{version}.tar.bz2
  Source1:        %{name}-settings.xml
  Source2:        %{name}-%{version}-jpp-depmap.xml
! Source3:        %{name}-component-info.xml
! Requires:       java >= 0:1.5.0
! Requires:       jboss-common-logging-spi
! BuildRequires:  jboss-parent >= 0:3.0
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.5.0
***************
*** 67,82 ****
  BuildRequires:  jboss-deploy-maven-plugin
  BuildRequires:  mojo-maven2-plugin-taglist
- 
  BuildRequires:  jboss-common-logging-spi
  BuildRequires:  junit4
  BuildRequires:  jakarta-commons-httpclient
  BuildRequires:  jakarta-slide-webdavclient
- 
- 
- Requires:       java >= 0:1.5.0
- Requires:       jboss-common-logging-spi
- 
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
  
  %description
--- 79,88 ----
  BuildRequires:  jboss-deploy-maven-plugin
  BuildRequires:  mojo-maven2-plugin-taglist
  BuildRequires:  jboss-common-logging-spi
  BuildRequires:  junit4
  BuildRequires:  jakarta-commons-httpclient
  BuildRequires:  jakarta-slide-webdavclient
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 97,108 ****
  %{summary}.
  
! %prep
! %setup -q 
! #find . -name "*.jar" -exec rm -f {} \;
! 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
--- 103,120 ----
  %{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 %{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
***************
*** 112,118 ****
  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-jboss-parent.pom
  
! mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
  
--- 124,130 ----
  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-jboss-parent.pom
  
! mkdir -p external_repo
  ln -s %{_javadir} external_repo/JPP
  
***************
*** 132,136 ****
  %add_to_maven_depmap org.jboss %{name} %{namedversion} JPP %{name}
  
! install -m 644 target/%{name}-%{namedversion}.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
--- 144,148 ----
  %add_to_maven_depmap org.jboss %{name} %{namedversion} JPP %{name}
  
! install -p -m 644 target/%{name}-%{namedversion}.jar \
             $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
***************
*** 143,146 ****
--- 155,159 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ # FIXME: (dwalluck): breaks -bi --short-circuit
  rm -rf target/site/apidocs
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
***************
*** 150,153 ****
--- 163,180 ----
  cp -pr target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE3} %{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 %{SOURCE2} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/jboss-common-core.jar
+ %endif
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 167,172 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %files manual
--- 194,199 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files manual
***************
*** 174,179 ****
  %doc %{_docdir}/%{name}-%{version}
  
  %changelog
  * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:2.2.8-1.jpp5
  - First release
- 
--- 201,215 ----
  %doc %{_docdir}/%{name}-%{version}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Mon Feb 09 2009 David Walluck <dwalluck at redhat.com> 0:2.2.10-1
+ - 2.2.10.GA
+ - add repolib
+ 
  * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:2.2.8-1.jpp5
  - First release

--- NEW FILE: jboss-common-core-2.2.10-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>slide</groupId>
         <artifactId>slide-webdavlib</artifactId>
         <version>2.1</version>
      </maven>
      <jpp>
         <groupId>JPP/slide</groupId>
         <artifactId>slide-webdavlib</artifactId>
         <version>2.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>apache-slide</groupId>
         <artifactId>webdavlib</artifactId>
         <version>2.0</version>
      </maven>
      <jpp>
         <groupId>JPP/slide</groupId>
         <artifactId>slide-webdavlib</artifactId>
         <version>2.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>apache-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
         <version>2.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>commons-httpclient</artifactId>
         <version>3.0.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit4</artifactId>
         <version>4.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit4</artifactId>
         <version>4.4</version>
      </jpp>
   </dependency>

</dependencies>

--- jboss-common-core-2.2.8-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list