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

David Walluck david at ryu.zarb.org
Mon Feb 9 23:43:04 CET 2009


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

Modified Files:
	jboss-common-logging-spi.spec 
Log Message:
- fix build

Index: jboss-common-logging-spi.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common-logging-spi/JPP-6/jboss-common-logging-spi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jboss-common-logging-spi.spec	9 Feb 2009 21:35:23 -0000	1.2
--- jboss-common-logging-spi.spec	9 Feb 2009 22:43:02 -0000	1.3
***************
*** 75,79 ****
  BuildRequires:  maven-surefire-report-plugin
  BuildRequires:  jboss-deploy-maven-plugin
! BuildRequires:  jboss-parent1
  BuildRequires:  mojo-maven2-plugin-taglist
  BuildArch:      noarch
--- 75,79 ----
  BuildRequires:  maven-surefire-report-plugin
  BuildRequires:  jboss-deploy-maven-plugin
! BuildRequires:  jboss-parent3
  BuildRequires:  mojo-maven2-plugin-taglist
  BuildArch:      noarch
***************
*** 115,118 ****
--- 115,121 ----
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
  
+ mkdir external_repo
+ ln -s %{_javadir} external_repo/JPP
+ 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
***************
*** 120,126 ****
  #cp %{SOURCE3} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss-jboss-parent.pom
  
- mkdir external_repo
- ln -s %{_javadir} external_repo/JPP
- 
  export M2_SETTINGS=$(pwd)/settings.xml
  mvn-jpp \
--- 123,126 ----
***************
*** 136,140 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! %add_to_maven_depmap org.jboss.logging jboss-logging-spi %{version}.GA JPP %{name}
  
  install -p -m 644 target/jboss-logging-spi-%{namedversion}.jar \
--- 136,140 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! %add_to_maven_depmap org.jboss.logging jboss-logging-spi %{namedversion} JPP %{name}
  
  install -p -m 644 target/jboss-logging-spi-%{namedversion}.jar \
***************
*** 152,156 ****
  # FIXME: (dwalluck): breaks -bi --short-circuit
  rm -rf target/site/apidocs
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  ## manual
--- 152,156 ----
  # FIXME: (dwalluck): breaks -bi --short-circuit
  rm -rf target/site/apidocs
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  ## manual
***************
*** 169,173 ****
  %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
  %endif
  
--- 169,173 ----
  %{__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-logging-spi.jar
  %endif
  




More information about the JPackage-commits mailing list