[Jpackage-commits] dist/jboss-metadata/devel jboss-metadata.spec, 1.8, 1.9

David Walluck david at ryu.zarb.org
Wed Jul 1 18:40:21 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jboss-metadata/devel
In directory ryu.zarb.org:/tmp/cvs-serv16760

Modified Files:
	jboss-metadata.spec 
Log Message:
- add repolib

Index: jboss-metadata.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-metadata/devel/jboss-metadata.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** jboss-metadata.spec	22 Jun 2009 18:07:26 -0000	1.8
--- jboss-metadata.spec	1 Jul 2009 16:40:19 -0000	1.9
***************
*** 29,53 ****
  #
  
  %define section free
! %define namedversion 1.0.1.GA
  
  Name:           jboss-metadata
  Version:        1.0.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss Metadata
! License:        LGPL
  Group:          Development/Java
  URL:            http://www.jboss.org/
  Source0:        jboss-metadata-1.0.1.tar.gz
- # svn export http://anonsvn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.1.GA/ jboss-metadata-1.0.1
- 
  Source1:        jboss-metadata-jpp-depmap.xml
  Source2:        jboss-metadata-settings.xml
! Source3:        http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
! Source4:        SOURCES/jboss-ejb3-ext-api-1.0.0.tar.gz
! 
  Patch0:         jboss-metadata-bootstrap-pom.patch
- 
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
--- 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/metadata/%{version}.%{reltag}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
! %define reltag GA
! %define namedversion %{version}.%{reltag}
  
  Name:           jboss-metadata
  Version:        1.0.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        JBoss Metadata
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://www.jboss.org/
+ # svn -q export http://anonsvn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.1.GA/ jboss-metadata-1.0.1
  Source0:        jboss-metadata-1.0.1.tar.gz
  Source1:        jboss-metadata-jpp-depmap.xml
  Source2:        jboss-metadata-settings.xml
! Source3:        jboss-metadata-component-info.xml
! Source4:        jboss-ejb3-ext-api-1.0.0.tar.gz
  Patch0:         jboss-metadata-bootstrap-pom.patch
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
***************
*** 72,75 ****
--- 81,85 ----
  BuildRequires:  jboss-javaee-poms
  BuildRequires:  jboss-mdr
+ BuildRequires:  jboss-parent
  BuildRequires:  jboss-vfs2
  BuildRequires:  jbossws-native >= 0:3.0.1
***************
*** 103,115 ****
  %{summary}.
  
  %prep
  %setup -q 
! tar xzf %{SOURCE4}
  cp -pr jboss-ejb3-ext-api-1.0.0/src/main/java/* src/main/java
  
! %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
--- 113,134 ----
  %{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 
! %setup -q -T -D -a 4
  cp -pr jboss-ejb3-ext-api-1.0.0/src/main/java/* src/main/java
+ %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
***************
*** 122,131 ****
  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-jboss-parent.pom
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dskip-enforce \
--- 141,149 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dskip-enforce \
***************
*** 134,138 ****
          install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 152,155 ----
***************
*** 154,158 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 171,191 ----
  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 %{SOURCE3} $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 %{SOURCE4} $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}/jboss-metadata.jar
! %endif
  
  %clean
***************
*** 167,181 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Jun 22 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1.jpp5
  - first release
- 
--- 200,223 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %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 Jun 30 2009 David Walluck <dwalluck at redhat.com> 0:1.0.1-2
+ - add repolib
+ 
  * Mon Jun 22 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1.jpp5
  - first release




More information about the JPackage-commits mailing list