[Jpackage-commits] dist/jboss-common-core/JPP-6 jboss-common-core.spec, 1.2, 1.3

David Walluck david at ryu.zarb.org
Tue Feb 10 00:13:06 CET 2009


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

Modified Files:
	jboss-common-core.spec 
Log Message:
- build fixes

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.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jboss-common-core.spec	9 Feb 2009 20:58:30 -0000	1.2
--- jboss-common-core.spec	9 Feb 2009 23:13:04 -0000	1.3
***************
*** 34,40 ****
  %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
--- 34,40 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
  
! %define repodir %{_javadir}/repository.jboss.com/jboss/jboss-common-core/%{namedversion}-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
***************
*** 60,67 ****
  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
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-compiler
--- 60,72 ----
  Requires:       java >= 0:1.5.0
  Requires:       jboss-common-logging-spi
! BuildRequires:  jakarta-commons-httpclient
! BuildRequires:  jakarta-slide-webdavclient
  BuildRequires:  java-devel >= 0:1.5.0
+ BuildRequires:  jboss-common-logging-spi
+ BuildRequires:  jboss-deploy-maven-plugin
+ BuildRequires:  jboss-parent >= 0:4.0
+ BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  junit
+ BuildRequires:  junit4
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-compiler
***************
*** 77,86 ****
  BuildRequires:  maven-surefire-plugin
  BuildRequires:  maven-surefire-report-plugin
- 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
--- 82,86 ----
***************
*** 121,131 ****
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
  
  %build
  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
  
  export M2_SETTINGS=$(pwd)/settings.xml
--- 121,130 ----
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
  
+ mkdir -p external_repo
+ ln -s %{_javadir} external_repo/JPP
+ 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
  
  export M2_SETTINGS=$(pwd)/settings.xml
***************
*** 150,154 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
--- 149,153 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
***************
*** 188,192 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
--- 187,192 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*




More information about the JPackage-commits mailing list