[libvte-java] update to 0.12.3
Tom Callaway
spot at fedoraproject.org
Sun Sep 19 11:13:43 UTC 2010
commit 1d4db8c44379d2f0d6dda9633472765366055938
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Sun Sep 19 13:13:33 2010 +0200
update to 0.12.3
.gitignore | 1 +
libvte-java-gjavah.patch | 34 ++++++++++++++++++----------------
libvte-java.spec | 31 +++++++++++--------------------
sources | 2 +-
4 files changed, 31 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcfd879..b5321f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libvte-java-0.12.1.tar.bz2
+/libvte-java-0.12.3.tar.bz2
diff --git a/libvte-java-gjavah.patch b/libvte-java-gjavah.patch
index 7b20b19..1e20231 100644
--- a/libvte-java-gjavah.patch
+++ b/libvte-java-gjavah.patch
@@ -1,6 +1,19 @@
---- ./configure.orig 2006-08-03 16:51:18.000000000 +0200
-+++ ./configure 2007-03-05 20:35:59.366449000 +0100
-@@ -22021,7 +22021,7 @@
+diff -up libvte-java-0.12.3/configure.ac.gjavah libvte-java-0.12.3/configure.ac
+--- libvte-java-0.12.3/configure.ac.gjavah 2010-09-18 17:21:32.214919987 +0200
++++ libvte-java-0.12.3/configure.ac 2010-09-18 17:18:27.756920000 +0200
+@@ -54,7 +54,7 @@ PKG_CHECK_MODULES(VTE, vte >= 0.12.1)
+ AC_SUBST(VTE_CFLAGS)
+ AC_SUBST(VTE_LIBS)
+
+-AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni])
++AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni])
+
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([vte-java.pc])
+diff -up libvte-java-0.12.3/configure.gjavah libvte-java-0.12.3/configure
+--- libvte-java-0.12.3/configure.gjavah 2010-09-18 17:19:48.840920002 +0200
++++ libvte-java-0.12.3/configure 2010-09-18 17:19:40.293919999 +0200
+@@ -22334,7 +22334,7 @@ fi
@@ -9,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
-@@ -22060,7 +22060,7 @@
+@@ -22375,7 +22375,7 @@ fi
test -n "$JAVAH" && break
done
@@ -17,15 +30,4 @@
+test -n "$JAVAH" || JAVAH="gjavah -jni"
- ac_config_files="$ac_config_files Makefile"
---- ./configure.ac.orig 2006-08-03 16:51:00.000000000 +0200
-+++ ./configure.ac 2007-03-05 20:36:05.603202000 +0100
-@@ -54,7 +54,7 @@
- AC_SUBST(VTE_CFLAGS)
- AC_SUBST(VTE_LIBS)
-
--AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni])
-+AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni])
-
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([vte-java.pc])
+ ac_config_files="$ac_config_files Makefile"
diff --git a/libvte-java.spec b/libvte-java.spec
index 298706d..bd88cca 100644
--- a/libvte-java.spec
+++ b/libvte-java.spec
@@ -1,21 +1,19 @@
Summary: Wrapper library for GNOME VTE
Name: libvte-java
-Version: 0.12.1
-Release: 15%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
URL: http://java-gnome.sourceforge.net
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.12/%{name}-%{version}.tar.bz2
License: LGPLv2+
Group: Development/Libraries
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch: libvte-java-alias2.patch
Patch1: %{name}-gjavah.patch
Requires: glib-java >= 0.2.4
-Requires: libgtk-java >= 2.8.4
+Requires: libgtk-java >= 2.10.0
Requires: vte >= 0.12.1
BuildRequires: java-devel >= 1.4.2, glib-java-devel >= 0.2.4
-BuildRequires: libgtk-java-devel >= 2.8.4
+BuildRequires: libgtk-java-devel >= 2.10.0
BuildRequires: gcc-java >= 4.1.1, docbook-utils, vte-devel >= 0.12.1
BuildRequires: pkgconfig
@@ -39,8 +37,7 @@ Development part of %{name}.
%prep
%setup -q -n %{name}-%{version}
-%patch
-%patch1
+%patch1 -p1 -b .gjavah
touch aclocal.m4
touch configure Makefile.in
@@ -62,8 +59,6 @@ touch -r ChangeLog src/java/src.zip
find doc -type f -newer ChangeLog | xargs touch -r ChangeLog
%install
-rm -rf $RPM_BUILD_ROOT
-
make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
# Remove unpackaged files:
@@ -79,26 +74,18 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
(cd $RPM_BUILD_ROOT%{_datadir}/java &&
ln -sf $zipfile $zipname.zip)
-# Is the NEWS file still empty? See the file list below.
-test -f NEWS -a ! -s NEWS
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-# Do not distribute the NEWS file, it is empty.
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README NEWS
%{_libdir}/libvtejava-*.so
%{_libdir}/libvtejni-*.so
%{_datadir}/java/*.jar
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc doc/api
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libvtejava.so
@@ -106,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/java/*.zip
%changelog
+* Sat Sep 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.12.3-1
+- update to 0.12.3
+- minor spec file cleanup
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 9794661..e5d5963 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d1d28710614910c80486b3bcdf08ae6 libvte-java-0.12.1.tar.bz2
+38696688111153afc3b1cce8b235b124 libvte-java-0.12.3.tar.bz2
More information about the scm-commits
mailing list