[libglade-java] update to 2.12.8
Tom Callaway
spot at fedoraproject.org
Sun Sep 19 11:16:11 UTC 2010
commit f5b74b2b3f85bd717d69ec5f11c4e06fbbbca766
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Sun Sep 19 13:16:01 2010 +0200
update to 2.12.8
.gitignore | 1 +
libglade-java-gjavah.patch | 18 ++++++++++--------
libglade-java.spec | 24 +++++++++---------------
sources | 2 +-
4 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5f6f11..c8a155f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libglade-java-2.12.5.tar.bz2
+/libglade-java-2.12.8.tar.bz2
diff --git a/libglade-java-gjavah.patch b/libglade-java-gjavah.patch
index 3def43e..a13d842 100644
--- a/libglade-java-gjavah.patch
+++ b/libglade-java-gjavah.patch
@@ -1,6 +1,7 @@
---- ./configure.ac.orig 2006-08-03 05:24:06.000000000 +0200
-+++ ./configure.ac 2007-03-05 20:14:24.724384000 +0100
-@@ -87,7 +87,7 @@
+diff -up libglade-java-2.12.8/configure.ac.gjavah libglade-java-2.12.8/configure.ac
+--- libglade-java-2.12.8/configure.ac.gjavah 2007-01-05 14:02:15.000000000 +0100
++++ libglade-java-2.12.8/configure.ac 2010-09-19 12:34:50.117255004 +0200
+@@ -87,7 +87,7 @@ PKG_CHECK_MODULES(LIBGLADE, libglade-2.0
AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS)
@@ -9,9 +10,10 @@
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([glade-java.pc])
---- ./configure.orig 2006-08-03 06:41:47.000000000 +0200
-+++ ./configure 2007-03-05 20:14:10.064063000 +0100
-@@ -22852,7 +22852,7 @@
+diff -up libglade-java-2.12.8/configure.gjavah libglade-java-2.12.8/configure
+--- libglade-java-2.12.8/configure.gjavah 2007-01-05 15:02:53.000000000 +0100
++++ libglade-java-2.12.8/configure 2010-09-19 12:35:23.445255003 +0200
+@@ -23341,7 +23341,7 @@ fi
@@ -20,7 +22,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -22891,7 +22891,7 @@
+@@ -23382,7 +23382,7 @@ fi
test -n "$JAVAH" && break
done
@@ -28,4 +30,4 @@
+test -n "$JAVAH" || JAVAH="gjavah -jni"
- ac_config_files="$ac_config_files Makefile"
+ ac_config_files="$ac_config_files Makefile"
diff --git a/libglade-java.spec b/libglade-java.spec
index 0df0b3f..611e1f0 100644
--- a/libglade-java.spec
+++ b/libglade-java.spec
@@ -14,21 +14,20 @@
Summary: Java bindings for libglade
Name: %{java_pkg_prefix}%{name_base}
-Version: 2.12.5
+Version: 2.12.8
Release: 12%{?dist}
License: LGPLv2
Group: Development/Libraries
URL: http://java-gnome.sourceforge.net
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch: %{name}-gjavah.patch
+Patch0: %{name}-gjavah.patch
Requires: libglade2 >= 2.5.1
-Requires: %{java_pkg_prefix}libgtk-java >= 2.8.6
-Requires: %{java_pkg_prefix}libgnome-java >= 2.12.4
-BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.6
-BuildRequires: %{java_pkg_prefix}libgnome-java-devel >= 2.12.4
+Requires: %{java_pkg_prefix}libgtk-java >= 2.10.0
+Requires: %{java_pkg_prefix}libgnome-java >= 2.12.7
+BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.10.0
+BuildRequires: %{java_pkg_prefix}libgnome-java-devel >= 2.12.7
BuildRequires: libglade2-devel >= 2.5.1, gcc-java >= 4.1.1
BuildRequires: java-devel >= 1.4.2
BuildRequires: docbook-utils
@@ -49,7 +48,7 @@ Development part of %{name}.
%prep
%setup -q -n %{name_base}-%{version}
-%patch
+%patch0 -p1 -b .gjavah
touch aclocal.m4
touch configure Makefile.in
@@ -75,8 +74,6 @@ find src/java -name \*.java -newer ChangeLog | xargs touch -r ChangeLog
touch -r ChangeLog src/java/src.zip
%install
-rm -rf %{buildroot}
-
make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
# rename doc dir to reflect package rename, if the names differ
@@ -99,18 +96,15 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/libgladejava-*.so
%{_libdir}/libgladejni-*.so
%{_datadir}/java/*.jar
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc doc/api
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libgladejava.so
diff --git a/sources b/sources
index 1084591..aebdf0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0dc4ca493a2978e04a055d838610a63 libglade-java-2.12.5.tar.bz2
+373f2ca04384848dd8ff1b0b2a21394a libglade-java-2.12.8.tar.bz2
More information about the scm-commits
mailing list