[glib-java] glib-java-0.4.2-glib-compat.patch: Fix header compat with new glib Fix Source URL
Adam Jackson
ajax at fedoraproject.org
Wed Jan 4 18:32:43 UTC 2012
commit 997b2a63a9dae8a1ed55e1b24f6d8822086e84c8
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Jan 4 18:29:38 2012 -0500
glib-java-0.4.2-glib-compat.patch: Fix header compat with new glib
Fix Source URL
glib-java-0.4.2-glib-compat.patch | 11 +++++++++++
glib-java.spec | 10 ++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/glib-java-0.4.2-glib-compat.patch b/glib-java-0.4.2-glib-compat.patch
new file mode 100644
index 0000000..bab4a76
--- /dev/null
+++ b/glib-java-0.4.2-glib-compat.patch
@@ -0,0 +1,11 @@
+diff -up glib-java-0.4.2/src/jni/jg_jnu.c.jx glib-java-0.4.2/src/jni/jg_jnu.c
+--- glib-java-0.4.2/src/jni/jg_jnu.c.jx 2007-01-05 06:49:15.000000000 -0500
++++ glib-java-0.4.2/src/jni/jg_jnu.c 2012-01-04 18:23:50.408098723 -0500
+@@ -5,7 +5,6 @@
+
+ #include "jg_jnu.h"
+ #include <stddef.h>
+-#include <glib/gmem.h>
+ #include <glib.h>
+ #include <string.h>
+
diff --git a/glib-java.spec b/glib-java.spec
index 2b84f34..7f29130 100644
--- a/glib-java.spec
+++ b/glib-java.spec
@@ -1,11 +1,12 @@
Summary: Base Library for the Java-GNOME libraries
Name: glib-java
Version: 0.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://java-gnome.sourceforge.net
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
Patch0: %{name}-gjavah.patch
Patch1: glib-java-0.4.2-import-fix.patch
+Patch2: glib-java-0.4.2-glib-compat.patch
License: LGPLv2
Group: Development/Libraries
@@ -36,6 +37,7 @@ Development part of %{name}.
%setup -q
%patch0 -p1 -b .gjavah
%patch1 -p1 -b .import
+%patch2 -p1 -b .header
touch aclocal.m4
touch configure Makefile.in
@@ -94,6 +96,10 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
%{_datadir}/java/*.zip
%changelog
+* Wed Jan 04 2012 Adam Jackson <ajax at redhat.com> 0.4.2-6
+- glib-java-0.4.2-glib-compat.patch: Fix header compat with new glib
+- Fix Source URL
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list