[Jpackage-commits] dist/jansi-native/devel jansi-native.spec, 1.4, 1.5

David Walluck david at ryu.zarb.org
Tue Dec 21 03:38:33 CET 2010


Update of /home/projects/jpackage/cvs/dist/jansi-native/devel
In directory ryu.zarb.org:/tmp/cvs-serv5807

Modified Files:
	jansi-native.spec 
Log Message:
- fix build

Index: jansi-native.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jansi-native/devel/jansi-native.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** jansi-native.spec	21 Dec 2010 01:58:09 -0000	1.4
--- jansi-native.spec	21 Dec 2010 02:38:31 -0000	1.5
***************
*** 118,140 ****
  %patch0 -p0
  
- 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
- 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
- export M2_SETTINGS=$(pwd)/settings.xml
  export CLASSPATH=
  export MAVEN_OPTS="-Xbootclasspath/p:$(build-classpath objectweb-asm)"
  %{_bindir}/mvn-jpp \
          -e \
-         -s $M2_SETTINGS \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
          deploy \
          javadoc:aggregate \
--- 118,129 ----
  %patch0 -p0
  
  %build
  export CLASSPATH=
  export MAVEN_OPTS="-Xbootclasspath/p:$(build-classpath objectweb-asm)"
  %{_bindir}/mvn-jpp \
          -e \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
+         -Dmaven.test.skip=false \
          deploy \
          javadoc:aggregate \
***************
*** 197,202 ****
  %files %{arch_name}
  %defattr(0644,root,root,0755)
! %{_javadir}*/jansi-native-%{version}-linux*.jar
! %{_javadir}*/jansi-native-linux*.jar
  
  %if 0
--- 186,191 ----
  %files %{arch_name}
  %defattr(0644,root,root,0755)
! %{_javadir}*/jansi-native-%{version}-%{arch_name}.jar
! %{_javadir}*/jansi-native-%{arch_name}.jar
  
  %if 0




More information about the JPackage-commits mailing list