diff --git a/.gitignore b/.gitignore index 4d1992d..5e6c2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wmeissner-jffi-bbb81f1.tar.gz /wmeissner-jffi-e0d10e9.tar.gz +/wmeissner-jffi-1.0.9-0-g893e964.tar.gz diff --git a/fix_compilation_flags.patch b/fix_compilation_flags.patch index 4e8db2f..9b5fb50 100644 --- a/fix_compilation_flags.patch +++ b/fix_compilation_flags.patch @@ -1,10 +1,10 @@ ---- jni/GNUmakefile.orig 2010-10-25 11:17:51.000000000 -0400 -+++ jni/GNUmakefile 2010-10-25 16:15:38.000000000 -0400 -@@ -65,9 +65,9 @@ OFLAGS = -O2 $(JFLAGS) - +--- jni/GNUmakefile.orig 2011-06-02 10:36:13.003446987 -0400 ++++ jni/GNUmakefile 2011-06-02 10:38:05.176447303 -0400 +@@ -66,9 +66,9 @@ OFLAGS = -O2 $(JFLAGS) # MacOS headers aren't completely warning free, so turn them off + WERROR = -Werror ifneq ($(OS),darwin) -- WFLAGS += -Wundef -Werror +- WFLAGS += -Wundef $(WERROR) + WFLAGS += -Wundef endif -WFLAGS += -W -Wall -Wno-unused -Wno-parentheses @@ -12,19 +12,19 @@ PICFLAGS = -fPIC SOFLAGS = # Filled in for each OS specifically FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT -@@ -75,11 +75,13 @@ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT +@@ -76,11 +76,13 @@ 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 ++STRIP ?= /bin/true + +RPMFLAGS=$(shell rpm --eval %optflags) JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" 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 += $(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) diff --git a/jffi.spec b/jffi.spec index faec8a5..8684c69 100644 --- a/jffi.spec +++ b/jffi.spec @@ -1,15 +1,15 @@ -%global git_commit e0d10e9 +%global git_commit 893e964 %global cluster wmeissner Name: jffi -Version: 1.0.2 -Release: 1.1%{?dist} +Version: 1.0.9 +Release: 1%{?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 +Source0: https://download.github.com/%{cluster}-%{name}-%{version}-0-g%{git_commit}.tar.gz Patch0: fix_dependencies_in_build_xml.patch Patch1: fix_jar_dependencies.patch Patch2: fix_compilation_flags.patch @@ -89,17 +89,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/ %{_jnidir}/* -%doc COPYING -%doc COPYING.LESSER - %files javadoc %defattr(-,root,root,-) %{_javadocdir}/jffi %changelog -* Tue May 17 2011 Karsten Hopp 1.0.2-1.1 -- change BR(check) into real buildrequirements as the latest rpm - doesn't support this anymore +* Wed Jun 01 2011 Mo Morsi - 1.0.9-1 +- Updated to most recent upstream release * Mon Oct 25 2010 - 1.0.2-1 - Updated to most recent upstream release diff --git a/sources b/sources index 04a4b63..0202c15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98ec919980a179d0de797c94993541a2 wmeissner-jffi-e0d10e9.tar.gz +6dcb04f4d085a745ce45996340a3ab8d wmeissner-jffi-1.0.9-0-g893e964.tar.gz