[Jpackage-commits] dist/jpackage-utils/devel jpackage-utils-javapackages-0.2.6-macros.fjava-python.patch, NONE, 1.1 jpackage-utils.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Sat Oct 15 05:41:05 CEST 2011


Update of /home/projects/jpackage/cvs/dist/jpackage-utils/devel
In directory ryu.zarb.org:/tmp/cvs-serv18930

Modified Files:
	jpackage-utils.spec 
Added Files:
	jpackage-utils-javapackages-0.2.6-macros.fjava-python.patch 
Log Message:
- fix fjava archive unpacking
- patch for python


--- NEW FILE: jpackage-utils-javapackages-0.2.6-macros.fjava-python.patch ---
--- javapackages-0.2.6/macros.fjava~	2011-09-15 08:40:28.000000000 -0400
+++ javapackages-0.2.6/macros.fjava	2011-10-14 23:38:07.371039306 -0400
@@ -51,7 +51,7 @@
 elif [ -f %{buildroot}/%{_jnidir}/%2 ]; then \
 	_jpath="%{buildroot}/%{_jnidir}/%2" \
 fi \
-python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
+PYTHONPATH=%{_javadir}-utils:${PYTHONPATH} python -m maven_depmap %{-a} \\\
           %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
           %{buildroot}%{_mavenpomdir}/%1 \\\
 %if %# == 2 \

Index: jpackage-utils.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** jpackage-utils.spec	15 Oct 2011 02:37:55 -0000	1.3
--- jpackage-utils.spec	15 Oct 2011 03:41:03 -0000	1.4
***************
*** 40,44 ****
  Name:           jpackage-utils
  Version:        5.0.0
! Release:        4%{?dist}
  Epoch:          0
  Summary:        JPackage utilities
--- 40,44 ----
  Name:           jpackage-utils
  Version:        5.0.0
! Release:        5%{?dist}
  Epoch:          0
  Summary:        JPackage utilities
***************
*** 60,63 ****
--- 60,64 ----
  Patch4:         jpackage-utils-prefer-jre.patch
  Patch5:         jpackage-utils-set-classpath.patch
+ Patch6:         jpackage-utils-javapackages-0.2.6-macros.fjava-python.patch
  Requires:       coreutils
  Requires:       findutils
***************
*** 118,125 ****
  %patch5 -p1
  %setup -q -T -D -b 1 -n jpackage-utils-1.7.5
  
  #cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
  
- tar xf %{SOURCE8}
  
  for manpage in `%{_bindir}/find man/ -type f`; do
--- 119,127 ----
  %patch5 -p1
  %setup -q -T -D -b 1 -n jpackage-utils-1.7.5
+ %setup -q -T -D -a 8 -n jpackage-utils-1.7.5
+ %patch6 -p0
  
  #cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
  
  
  for manpage in `%{_bindir}/find man/ -type f`; do
***************
*** 331,334 ****
--- 333,340 ----
  
  %changelog
+ * Fri Oct 14 2011 David Walluck <dwalluck at redhat.com> 0:5.0.0-5
+ - fix fjava archive unpacking
+ - patch for python
+ 
  * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 0:5.0.0-4
  - merge Fedora extensions (javapackages-0.2.6.tar.bz2)




More information about the JPackage-commits mailing list