rpms/java-gnome/devel import.log, NONE, 1.1 java-gnome-jpackage-compatible-new.patch, NONE, 1.1 java-gnome.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[abo]

Author: abo

Update of /cvs/pkgs/rpms/java-gnome/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5199/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log java-gnome-jpackage-compatible-new.patch 
	java-gnome.spec 
Log Message:
Initial commit.



--- NEW FILE import.log ---
java-gnome-4_0_15-3_fc12:HEAD:java-gnome-4.0.15-3.fc12.src.rpm:1271873331

java-gnome-jpackage-compatible-new.patch:
 configure |   36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

--- NEW FILE java-gnome-jpackage-compatible-new.patch ---
--- configure.jpackagecompat	2009-05-01 06:11:11.000000000 +0200
+++ configure	2009-06-30 00:44:32.000000000 +0200
@@ -43,6 +43,7 @@
 #
 
 my $os;
+my $vmlayout;
 my $quiet;
 
 # There's nothing worse than having an old config file, getting half way
@@ -654,6 +655,12 @@
 
 output "\n";
 
+if ( -f "/etc/java/jpackage-release" ) {
+  $vmlayout = "jpackage";
+} else {
+  $vmlayout = "unknown";
+}
+
 # --------------------------------------------------------------------
 # Specify locations of dependencies, by operating system, and 
 # verify pre-requisites are present.
@@ -857,9 +864,17 @@
 my $javah;
 my $jar;
 my $javadoc;
-
+if ($vmlayout eq "jpackage") {
+	my $vendor = "System";
+	check_compiler($javac, "$vendor javac", "/usr/bin/javac", "-g -source 5 -target 5");
+	check_jni_header_generator($javah, "$vendor javah", "/usr/bin/javah", "-jni");
+	check_jar($jar, "System jar", "/usr/bin/jar", "");
+	check_javadoc($javadoc, "$vendor javadoc", "/usr/bin/javadoc", "");
+} else {
+	output "Unknown VM layout, trying OS-specific routines\n";
+}
+if (!$javac) {
 if ($os eq "gentoo") {
-
 	if ( ! -x "/usr/bin/java-config") {
 		bail "", "INTERNAL ERROR couldn't find java-config";
 	}
@@ -1245,6 +1260,7 @@
 } else {
 	bail "failed!", "This OS not configured with a workable Java compiler checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG.";
 }
+}
 
 output "\n";
 
@@ -1261,6 +1277,13 @@
 my $cacao;
 my $jamvm;
 
+if ($vmlayout eq "jpackage") {
+	my $vendor = "System";
+	check_runtime($java, "$vendor javac", "/usr/bin/java", "-client -ea");
+} else {
+	output "Unknown VM layout, trying OS-specific routines\n";
+}
+if (!$java) {
 if ($os eq "gentoo") {
 	# check java (the one specified by Gentoo's java-config tool)
 	# Is there any actual scenario where the javac would be from one 
@@ -1641,6 +1664,7 @@
 } else {
 	bail "failed!", "This OS not configured with appropriate Java VM checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG.";
 }
+}
 
 output "\n";
 
@@ -1865,7 +1889,15 @@
 
 	my $jni_include = "";
 	my $java_home = dirname($java);
+	my $java_home;
+	if ($vmlayout = "jpackage") {
+		$java_home = dirname(`readlink /etc/alternatives/javac`);
+		chomp($java_home);
+	} else {
+		$java_home = dirname($java);
+	}
 	$java_home =~ s/\/bin$//;
+	output "Using Java SDK home: $java_home\n";
 
 	if (!-d "$java_home"."/include") {
 		$java_home =~ s/\/jre//;


--- NEW FILE java-gnome.spec ---
Summary:	Java GNOME bindings
Name:		java-gnome
Version:	4.0.15
Release:	3%{?dist}
URL:		http://java-gnome.sourceforge.net
Source0:	http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.bz2
# This is the "Classpath" exception.
License:	GPLv2 with exceptions
Group:		System Environment/Libraries
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	pkgconfig
BuildRequires:	pkgconfig(atk)
BuildRequires:	pkgconfig(cairo-svg)
BuildRequires:	pkgconfig(enchant)
BuildRequires:	pkgconfig(gdk-2.0)
BuildRequires:	pkgconfig(glib-2.0)
BuildRequires:	pkgconfig(gtk+-2.0)
BuildRequires:	pkgconfig(gtk+-unix-print-2.0)
BuildRequires:	pkgconfig(gtksourceview-2.0)
BuildRequires:	pkgconfig(gtkspell-2.0)
BuildRequires:	pkgconfig(libglade-2.0)
BuildRequires:	pkgconfig(libnotify)
BuildRequires:	pkgconfig(pango)
BuildRequires:	pkgconfig(unique-1.0)
BuildRequires:	gettext
BuildRequires:	junit
BuildRequires:	python
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
BuildRequires:	xorg-x11-server-Xvfb
Requires:	java >= 1:1.6.0
Requires:	jpackage-utils
# http://bugzilla.gnome.org/show_bug.cgi?id=523656
Patch0:	java-gnome-jpackage-compatible-new.patch

%description
These are the Java bindings for GTK and GNOME! Featuring a robust 
engineering design, completely generated internals, a lovingly 
crafted layer presenting the public API, and steadily increasing 
coverage of the underlying libraries.

You can use java-gnome to develop sophisticated user interfaces 
for Linux applications so that they richly integrate with the 
GNOME Desktop while leveraging the power of the Java language 
and your expertise with it.

%package	javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils
BuildArch:	noarch

%description	javadoc
This package contains the API documentation for %{name}, along with
design documentation and sample code.

%prep
%setup -q
%patch0 -p0 -b .jpackagecompat

if find -name '*.class' -o -name '*.jar' | grep . >&2; then
    echo >&2 "Prebuilt binaries found in the sources. See https://fedoraproject.org/wiki/Packaging:Java#Pre-built_JAR_files_.2F_Other_bundled_software for instructions."
    exit 1
fi

%build
# It'll get two conflicting --libdir parameters, but the last one
# happens to win which is what we want.
%configure --jardir=%{_libdir}/%{name} --libdir=%{_libdir}/%{name}

# The build system does not support parallell builds, so no
# _smp_mflags.
make V=1 build-java doc

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_javadir}
make install DESTDIR=%{buildroot}

mv %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar %{buildroot}%{_libdir}/%{name}/java-gnome.jar
ln -s java-gnome.jar %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar

mkdir -p %{buildroot}%{_javadocdir}
cp -rp doc/api %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS LICENCE
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.jar
%{_libdir}/%{name}/*.so

%files javadoc
%defattr(-,root,root,-)
# Note that not all here is javadoc. Two subpackages for documentation
# seems silly.
%doc doc/design doc/examples
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}

%changelog
* Sun Apr 18 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.15-3
- add back the jar symlink

* Sat Apr 17 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.15-2
- make the javadoc subpackage noarch
- add an unversioned symlink to the javadoc

* Fri Mar 19 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.15-1
- upgrade to 4.0.15
- remove jar symlink that's not actually required

* Sat Jan  2 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.14-3
- rearrange jar symlinks

* Fri Jan  1 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.14-2
- fix license
- fix .jar, .class check

* Thu Dec 31 2009 Alexander Boström <abo at root.snowtree.se> - 4.0.14-1
- upgrade to 4.0.14
- add lots of BuildRequires
- use pkg-config to get values for CFLAGS and LDFLAGS
- rename jar
- various little fixes

* Fri Jul  3 2009 Alexander Boström <abo at root.snowtree.se> - 4.0.11-1
- upgrade to 4.0.11
- make jpackagecompatible patch apply cleanly
- remove jnipath patch, it won't apply and it looks like it's not
  needed anymore
- move JARs and JNI .so according to guidelines
- install javadoc and put it in a subpackage

* Wed May 14 2008 Colin Walters <walters at redhat.com> - 4.0.7-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Apr 2010 04:14:24 -0000	1.1
+++ .cvsignore	21 Apr 2010 19:00:16 -0000	1.2
@@ -0,0 +1 @@
+java-gnome-4.0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Apr 2010 04:14:24 -0000	1.1
+++ sources	21 Apr 2010 19:00:16 -0000	1.2
@@ -0,0 +1 @@
+613492d9d1640213701f5d3e566a06df  java-gnome-4.0.15.tar.bz2