rpms/jffi/F-12 fix_compilation_flags.patch, NONE, 1.1 fix_dependencies_in_build_xml.patch, NONE, 1.1 fix_jar_dependencies.patch, NONE, 1.1 import.log, NONE, 1.1 jffi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue May 4 17:54:30 UTC 2010

Author: mmorsi

Update of /cvs/pkgs/rpms/jffi/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10017/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	fix_compilation_flags.patch 
	fix_dependencies_in_build_xml.patch fix_jar_dependencies.patch 
	import.log jffi.spec 
Log Message:
Initial jffi import



fix_compilation_flags.patch:
 GNUmakefile |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE fix_compilation_flags.patch ---
--- jni/GNUmakefile.orig	2010-02-23 12:42:51.564630229 -0500
+++ jni/GNUmakefile	2010-02-23 15:15:40.773647826 -0500
@@ -62,25 +62,27 @@
 JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
 OFLAGS = -O2 $(JFLAGS)
 
 # MacOS headers aren't completely warning free, so turn them off
 ifneq ($(OS),darwin)
-  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
+  WFLAGS = -W -Wall -Wno-parentheses -Wundef
 endif
 PICFLAGS = -fPIC
 SOFLAGS = # Filled in for each OS specifically
 FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
 
 FFI_CC=$(CCACHE) $(CC)
 FFI_LD=$(LD)
 FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
-STRIP = strip -S
+STRIP = /bin/true
 
 JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
 
+RPMFLAGS=$(shell rpm --eval %optflags)
+
 IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) $(RPMFLAGS)
 CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
 
 ifeq ($(OS), win64)
   override CPU = x86_64
   JDK_INCLUDES=-I$(JNI_DIR)/win32/include -I$(JNI_DIR)/win32/include/win32

fix_dependencies_in_build_xml.patch:
 custom-build.xml |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

--- NEW FILE fix_dependencies_in_build_xml.patch ---
--- custom-build.xml.orig	2010-02-17 19:14:51.888382184 -0500
+++ custom-build.xml	2010-02-17 19:15:49.675385072 -0500
@@ -120,12 +120,11 @@
             <arg value="SRC_DIR=${jni.src.dir}"/>
             <arg value="JNI_DIR=${jni.src.dir}"/>
             <arg value="BUILD_DIR=${jni.build.dir}"/>
             <arg value="CPU=${platform.cpu}"/>
             <arg value="VERSION=${jffi.version.major}.${jffi.version.minor}"/>
-            <arg value="USE_SYSTEM_LIBFFI=${use.system.libffi}"/>
-            <!-- <arg value="USE_SYSTEM_LIBFFI=0"/> -->
+            <arg value="USE_SYSTEM_LIBFFI=1"/>
             <arg value="-f"/>
             <arg value="${jni.GNUmakefile}"/>
         </exec>
 
     </target>
@@ -190,20 +189,10 @@
     </target>
     <target name="-assemble-native-jar" depends="-init-vars, -build-platform-jar">
         <jar jarfile="${native.jar}" index="true" update="true" duplicate="preserve"
             filesetmanifest="skip">
             <zipfileset src="${dist.dir}/${platform}.jar"/>
-            <zipfileset src="archive/Darwin.jar"/>
-            <zipfileset src="archive/i386-Windows.jar"/>
-            <zipfileset src="archive/i386-Linux.jar"/>
-            <zipfileset src="archive/i386-SunOS.jar"/>
-            <zipfileset src="archive/x86_64-Linux.jar"/>
-            <zipfileset src="archive/x86_64-SunOS.jar"/>
-            <zipfileset src="archive/s390x-Linux.jar"/>
-            <zipfileset src="archive/sparc-SunOS.jar"/>
-            <zipfileset src="archive/sparcv9-SunOS.jar"/>
-            <zipfileset src="archive/ppc-AIX.jar"/>
         </jar>
     </target>
     <target name="-archive-platform-jar" depends="-build-platform-jar">
         <copy file="${dist.dir}/${platform}.jar" todir="archive" flatten="true"/>
     </target>

fix_jar_dependencies.patch:
 nblibraries.properties |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE fix_jar_dependencies.patch ---
--- lib/nblibraries.properties.orig	2010-02-23 13:49:59.863628941 -0500
+++ lib/nblibraries.properties	2010-02-23 13:50:56.443652922 -0500
@@ -1,12 +1,10 @@
 libs.junit.classpath=\
-    ${base}/junit/junit-3.8.2.jar
+    ${base}/build_lib/junit.jar
 libs.junit.javadoc=\
     ${base}/junit/junit-3.8.2-api.zip
 libs.junit_4.classpath=\
-    ${base}/junit_4/junit-4.5.jar
+    ${base}/build_lib/junit4.jar
 libs.junit_4.javadoc=\
     ${base}/junit_4/junit-4.5-api.zip
 libs.junit_4.src=\
     ${base}/junit_4/junit-4.5-src.jar
-libs.CopyLibs.classpath=\
-    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar


--- NEW FILE import.log ---
jffi-0_6_5-4_fc11:F-12:jffi-0.6.5-4.fc11.src.rpm:1272995791


--- NEW FILE jffi.spec ---
%global git_commit bbb81f1
%global cluster wmeissner

Name:    jffi
Version: 0.6.5
Release: 4%{?dist}
Summary: An optimized Java interface to libffi 

Group:   System Environment/Libraries
License: LGPLv3
URL:     http://github.com/%{cluster}/%{name}
Source0: %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
Patch0:  fix_dependencies_in_build_xml.patch
Patch1:  fix_jar_dependencies.patch
Patch2:  fix_compilation_flags.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: libffi-devel
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires(check): ant-junit
BuildRequires(check): junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils

%description
An optimized Java interface to libffi 

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{cluster}-%{name}-%{git_commit}
%patch0
%patch1
%patch2

# ppc{,64} fix
# https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9
sed -i.cpu -e '/m\$(MODEL)/d' jni/GNUmakefile libtest/GNUmakefile
%ifnarch %{ix86} x86_64
rm -rf test/
%endif

# remove random executable bit
chmod 0644 jni/jffi/jffi.h

# remove uneccessary directories
rm -rf archive/ jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*

find ./ -name '*.jar' -exec rm -f '{}' \; 
find ./ -name '*.class' -exec rm -f '{}' \; 

%build
mkdir lib/build_lib
build-jar-repository -s -p lib/build_lib junit junit4

ant

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_jnidir}

cp build/jni/libjffi-0.6.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
cp dist/jffi-complete.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
ln -s %{_libdir}/%{name}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/jffi

%check
ant test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/%{name}/
%{_jnidir}/*

%doc COPYING
%doc COPYING.LESSER

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/jffi

%changelog
* Wed Apr 14 2010  <mmorsi at redhat.com> - 0.6.5-4
- added Mamoru Tasaka's fix for ppc{,64} to prep

* Mon Mar 08 2010  <mmorsi at redhat.com> - 0.6.5-3
- fixes to jffi from feedback
- don't strip debuginfo, remove extraneous executable bits,

* Tue Feb 23 2010  <mmorsi at redhat.com> - 0.6.5-2
- fixes to jffi compilation process
- fixes to spec to conform to package guidelines

* Wed Feb 17 2010  <mmorsi at redhat.com> - 0.6.5-1
- bumped version
- fixed package to comply to fedora guidelines

* Tue Jan 19 2010  <mmorsi at redhat.com> - 0.6.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jffi/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2010 02:14:17 -0000	1.1
+++ .cvsignore	4 May 2010 17:54:29 -0000	1.2
@@ -0,0 +1 @@
+wmeissner-jffi-bbb81f1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jffi/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2010 02:14:17 -0000	1.1
+++ sources	4 May 2010 17:54:30 -0000	1.2
@@ -0,0 +1 @@
+a12937715146b2374f0e209c7468f5df  wmeissner-jffi-bbb81f1.tar.gz

