[Jpackage-commits] dist/hawtjni/JPP-6 hawtjni-ac-prereq.patch, NONE, 1.1 hawtjni-asm.patch, NONE, 1.1 hawtjni.spec, 1.7, 1.8

David Walluck david at ryu.zarb.org
Tue Dec 21 04:08:29 CET 2010


Update of /home/projects/jpackage/cvs/dist/hawtjni/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv16718

Modified Files:
	hawtjni.spec 
Added Files:
	hawtjni-ac-prereq.patch hawtjni-asm.patch 
Log Message:
- make this an arch package
- make example optional
- fix objectweb-asm version


--- NEW FILE: hawtjni-ac-prereq.patch ---
--- maven-hawtjni-plugin/src/main/resources/project-template/configure.ac.orig	2010-12-17 15:59:24.000000000 -0500
+++ maven-hawtjni-plugin/src/main/resources/project-template/configure.ac	2010-12-20 22:01:29.974302752 -0500
@@ -18,7 +18,7 @@
 ## --------------------------------
 ## Initialization macros.
 ## --------------------------------
-AC_PREREQ([2.61])
+AC_PREREQ([2.50])
 AC_INIT([@PROJECT_NAME@], [@VERSION@])
 AC_CONFIG_AUX_DIR([autotools])
 AC_CONFIG_MACRO_DIR([m4])
@@ -60,4 +60,4 @@
   Prefix.........: $prefix
   C Compiler.....: $CC $CFLAGS
   Linker.........: $LD $LDFLAGS $LIBS
-"
\ No newline at end of file
+"
--- maven-hawtjni-plugin/src/main/resources/project-template/m4/jni.m4.orig	2010-12-17 15:59:24.000000000 -0500
+++ maven-hawtjni-plugin/src/main/resources/project-template/m4/jni.m4	2010-12-20 22:01:34.949424756 -0500
@@ -32,7 +32,7 @@
 
 AC_DEFUN([WITH_JNI_JDK],
 [
-  AC_PREREQ([2.61])
+  AC_PREREQ([2.50])
   AC_ARG_WITH(jni-jdk,
 		[AS_HELP_STRING([--with-jni-jdk=PATH],
 			[Location of the Java Development Kit.  Defaults to your JAVA_HOME setting and falls back to where it is typically installed on your OS])],
--- maven-hawtjni-plugin/src/main/resources/project-template/m4/osx-universal.m4.orig	2010-12-17 15:59:24.000000000 -0500
+++ maven-hawtjni-plugin/src/main/resources/project-template/m4/osx-universal.m4	2010-12-20 22:01:40.810568504 -0500
@@ -39,7 +39,7 @@
 
 AC_DEFUN([WITH_OSX_UNIVERSAL],
 [
-  AC_PREREQ([2.61])
+  AC_PREREQ([2.50])
   case "$host_os" in
 	darwin*)
   	AS_IF(test -z "$OSX_VERSION", [

--- NEW FILE: hawtjni-asm.patch ---
--- hawtjni-generator/pom.xml.orig	2010-12-17 16:00:05.000000000 -0500
+++ hawtjni-generator/pom.xml	2010-12-20 22:06:52.335152706 -0500
@@ -43,14 +43,14 @@
       <version>3.6</version>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>3.1</version>
+      <version>3.2</version>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm-commons</artifactId>
-      <version>3.1</version>
+      <version>3.2</version>
     </dependency>
     
     <!-- 

Index: hawtjni.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hawtjni/JPP-6/hawtjni.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** hawtjni.spec	21 Dec 2010 00:08:51 -0000	1.7
--- hawtjni.spec	21 Dec 2010 03:08:27 -0000	1.8
***************
*** 35,38 ****
--- 35,39 ----
  
  %bcond_with gcj_support
+ %bcond_without example
  %bcond_without repolib
  
***************
*** 47,51 ****
  Name:           hawtjni
  Version:        1.1
! Release:        3%{?dist}
  Epoch:          0
  Summary:        HawtJNI
--- 48,52 ----
  Name:           hawtjni
  Version:        1.1
! Release:        4%{?dist}
  Epoch:          0
  Summary:        HawtJNI
***************
*** 60,73 ****
  Patch0:         hawtjni-plexus-archiver-unarchiver.patch
  Patch1:         hawtjni-pom.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
  Requires:       jpackage-utils
  BuildRequires:  apache-commons-parent
  BuildRequires:  maven2-plugin-eclipse
  BuildRequires:  maven2-plugin-idea
  BuildRequires:  maven2-plugin-shade
  BuildRequires:  plexus-io
  BuildRequires:  fusesource-pom
- BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 61,88 ----
  Patch0:         hawtjni-plexus-archiver-unarchiver.patch
  Patch1:         hawtjni-pom.patch
+ Patch2:         hawtjni-ac-prereq.patch
+ Patch3:         hawtjni-asm.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
  Requires:       jpackage-utils
+ Requires:       autoconf
+ Requires:       automake
+ Requires:       maven2-plugin-eclipse
+ Requires:       maven2-plugin-idea
+ Requires:       maven2-plugin-shade
+ Requires:       objectweb-asm
+ Requires:       plexus-io
+ Requires:       fusesource-pom
  BuildRequires:  apache-commons-parent
+ %if %with example
+ BuildRequires:  autoconf
+ BuildRequires:  automake
+ %endif
  BuildRequires:  maven2-plugin-eclipse
  BuildRequires:  maven2-plugin-idea
  BuildRequires:  maven2-plugin-shade
+ BuildRequires:  objectweb-asm
  BuildRequires:  plexus-io
  BuildRequires:  fusesource-pom
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
***************
*** 107,111 ****
--- 122,130 ----
  %setup -q
  %patch0 -p0 -b .sav0
+ %if %without example
  %patch1 -p0 -b .sav1
+ %endif
+ %patch2 -p0 -b .sav2
+ %patch3 -p0 -b .sav3
  
  cp -p %{SOURCE1} settings.xml
***************
*** 138,146 ****
  mkdir -p %{buildroot}%{_datadir}/maven2/poms
  
! %if 0
  cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-linux*.jar %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-native-src.zip %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.jar %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-example.pom
  %add_to_maven_depmap org.fusesource.hawtjni hawtjni-example %{version} JPP %{name}-example
  %endif
--- 157,165 ----
  mkdir -p %{buildroot}%{_datadir}/maven2/poms
  
! %if %with example
  cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-linux*.jar %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-native-src.zip %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.jar %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-example.pom
  %add_to_maven_depmap org.fusesource.hawtjni hawtjni-example %{version} JPP %{name}-example
  %endif
***************
*** 191,195 ****
  %files
  %defattr(0644,root,root,0755)
! %if 0
  %{_javadir}*/hawtjni-example-%{version}-linux*.jar
  %{_javadir}*/hawtjni-example-linux*.jar
--- 210,214 ----
  %files
  %defattr(0644,root,root,0755)
! %if %with example
  %{_javadir}*/hawtjni-example-%{version}-linux*.jar
  %{_javadir}*/hawtjni-example-linux*.jar
***************
*** 205,209 ****
  %{_javadir}*/%{name}-runtime-%{version}.jar
  %{_javadir}*/%{name}-runtime.jar
! %if 0
  %{_datadir}/maven2/poms/JPP-%{name}-example.pom
  %endif
--- 224,228 ----
  %{_javadir}*/%{name}-runtime-%{version}.jar
  %{_javadir}*/%{name}-runtime.jar
! %if %with example
  %{_datadir}/maven2/poms/JPP-%{name}-example.pom
  %endif
***************
*** 233,236 ****
--- 252,260 ----
  
  %changelog
+ * Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:1.1-4
+ - make this an arch package
+ - make example optional
+ - fix objectweb-asm version
+ 
  * Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:1.1-3
  - fix maven-hawtjni-plugin depmap entry




More information about the JPackage-commits mailing list