From cd84bab8ffacd6137e370542e3bd34d48fcbbde6 Mon Sep 17 00:00:00 2001 From: grzegol Date: Sun, 4 Jul 2004 22:35:21 +0000 Subject: [PATCH 1/4] - updated to 2.7.2 - added typo patch (fix small typo in function name) Changed files: java-libgtkhtml.spec -> 1.2.2.1 --- java-libgtkhtml.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/java-libgtkhtml.spec b/java-libgtkhtml.spec index 222194c..9c042b6 100644 --- a/java-libgtkhtml.spec +++ b/java-libgtkhtml.spec @@ -1,25 +1,26 @@ %define pname libgtkhtml-java -%define api 2.6 +%define api 2.7 %define gtkapi 2.4 Summary: Java interface for libgtkhtml Summary(pl): Wrapper Java dla libgtkhtml Name: java-libgtkhtml -Version: 2.6.0 +Version: 2.7.2 Release: 1 License: LGPL Group: Libraries Source0: http://dl.sourceforge.net/java-gnome/%{pname}-%{version}.tar.bz2 -# Source0-md5: 572c58994f7f28127bdbc382d2f632d5 +# Source0-md5: 9a203dbe85525c51863b0c23fe5b866a Patch0: %{name}-configure.patch Patch1: %{name}-version_vars.patch +Patch2: %{name}-typo.patch URL: http://java-gnome.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-java >= 3.3.2 -BuildRequires: gtk+2-devel >= 2:2.4.0 -BuildRequires: java-gtk-devel >= 2.4.0 +BuildRequires: gtk+2-devel >= 2:2.4.3 +BuildRequires: java-gtk-devel >= 2.4.2 BuildRequires: libgcj-devel >= 3.3.2 -BuildRequires: libgtkhtml-devel >= 2.6.0 +BuildRequires: libgtkhtml-devel >= 2.6.2 BuildRequires: slocate BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,10 +46,11 @@ Pliki nag %setup -q -n %{pname}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -version="%{version}"; export version -apiversion="%{api}"; export apiversion +gtkhtmlapiversion="%{api}"; export gtkhtmlapiversion +gtkhtmlversion="%{version}"; export gtkhtmlversion gtkapiversion="%{gtkapi}"; export gtkapiversion %{__autoconf} %configure From 493c991269e8e553ba50592f7e7fc232adcf32d6 Mon Sep 17 00:00:00 2001 From: grzegol Date: Sun, 4 Jul 2004 22:36:12 +0000 Subject: [PATCH 2/4] - updated for java-libgtkhtml-2.7.2 Changed files: java-libgtkhtml-configure.patch -> 1.1.2.1 java-libgtkhtml-version_vars.patch -> 1.1.2.1 --- java-libgtkhtml-configure.patch | 2 +- java-libgtkhtml-version_vars.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-libgtkhtml-configure.patch b/java-libgtkhtml-configure.patch index ab78c44..1616195 100644 --- a/java-libgtkhtml-configure.patch +++ b/java-libgtkhtml-configure.patch @@ -6,7 +6,7 @@ diff -urN aa/libgtkhtml-java-2.6.0/configure.in libgtkhtml-java-2.6.0/configure. AC_SUBST(LIBGLADE_LIBS) -AC_INIT(gtk/src/jni/org_gnu_gtk_Gtk.c) -+AC_INIT(src/jni/org_gnu_gtk_html_dom_DomNode.c) ++AC_INIT(src/jni/org_gnu_gtkhtml_dom_DomNode.c) dnl Find already installed gnome modules diff --git a/java-libgtkhtml-version_vars.patch b/java-libgtkhtml-version_vars.patch index 2a5d5d8..1f88062 100644 --- a/java-libgtkhtml-version_vars.patch +++ b/java-libgtkhtml-version_vars.patch @@ -5,8 +5,8 @@ diff -urN aa/libgtkhtml-java-2.6.0/configure.in libgtkhtml-java-2.6.0/configure. AC_INIT(src/jni/org_gnu_gtk_html_dom_DomNode.c) -+AC_SUBST(version) -+AC_SUBST(apiversion) ++AC_SUBST(gtkhtmlversion) ++AC_SUBST(gtkhtmlapiversion) +AC_SUBST(gtkapiversion) dnl Find already installed gnome modules From 042b42438aa9a3c85a4cb09aec14d75d97d2fbc6 Mon Sep 17 00:00:00 2001 From: grzegol Date: Sun, 4 Jul 2004 22:36:46 +0000 Subject: [PATCH 3/4] - fix typo in function name Changed files: java-libgtkhtml-typo.patch -> 1.1.2.1 --- java-libgtkhtml-typo.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 java-libgtkhtml-typo.patch diff --git a/java-libgtkhtml-typo.patch b/java-libgtkhtml-typo.patch new file mode 100644 index 0000000..79d21ef --- /dev/null +++ b/java-libgtkhtml-typo.patch @@ -0,0 +1,12 @@ +diff -urN aa/libgtkhtml-java-2.7.2/src/jni/org_gnu_gtkhtml_dom_DomNodeList.c libgtkhtml-java-2.7.2/src/jni/org_gnu_gtkhtml_dom_DomNodeList.c +--- aa/libgtkhtml-java-2.7.2/src/jni/org_gnu_gtkhtml_dom_DomNodeList.c 2004-06-08 15:15:39.000000000 +0200 ++++ libgtkhtml-java-2.7.2/src/jni/org_gnu_gtkhtml_dom_DomNodeList.c 2004-07-05 00:24:39.670825096 +0200 +@@ -55,7 +55,7 @@ + JNIEXPORT jint JNICALL Java_org_gnu_gtkhtml_dom_DomNodeList_dom_1node_1list_1get_1item + (JNIEnv *env, jclass cls, jint list, jlong index) + { +- return (jint) dom_NodeList_get_item((DomNodeList *)list, (gulong) index); ++ return (jint) dom_NodeList__get_item((DomNodeList *)list, (gulong) index); + } + + #ifdef __cplusplus From d27b04f612cc78b3cd1ec8faa3b427ee55e62c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20R=C4=99korajski?= Date: Mon, 12 Feb 2007 13:20:13 +0000 Subject: [PATCH 4/4] - converted to UTF-8 Changed files: java-libgtkhtml.spec -> 1.2.2.2 --- java-libgtkhtml.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java-libgtkhtml.spec b/java-libgtkhtml.spec index 9c042b6..a425c6e 100644 --- a/java-libgtkhtml.spec +++ b/java-libgtkhtml.spec @@ -2,7 +2,7 @@ %define api 2.7 %define gtkapi 2.4 Summary: Java interface for libgtkhtml -Summary(pl): Wrapper Java dla libgtkhtml +Summary(pl.UTF-8): Wrapper Java dla libgtkhtml Name: java-libgtkhtml Version: 2.7.2 Release: 1 @@ -27,20 +27,20 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Java interface for libgtkhtml. -%description -l pl +%description -l pl.UTF-8 Wrapper Java dla libgtkhtml. %package devel Summary: Header files for java-libgtkhtml library -Summary(pl): Pliki nag³ówkowe biblioteki java-libgtkhtml +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki java-libgtkhtml Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Header files for java-libgtkhtml library. -%description devel -l pl -Pliki nag³ówkowe biblioteki java-libgtkhtml. +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki java-libgtkhtml. %prep %setup -q -n %{pname}-%{version}