rpms/libgnome-java/devel .cvsignore, 1.8, 1.9 libgnome-java.spec, 1.18, 1.19 sources, 1.8, 1.9 libgnome-java-install.patch, 1.1, NONE libgnome-java-run-example.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ifoox

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22628

Modified Files:
	.cvsignore libgnome-java.spec sources 
Removed Files:
	libgnome-java-install.patch libgnome-java-run-example.patch 
Log Message:
Imported libgnome-java-2.12.0 from upstream.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Apr 2005 19:14:04 -0000	1.8
+++ .cvsignore	24 Sep 2005 15:20:34 -0000	1.9
@@ -1 +1 @@
-libgnome-java-2.10.1.tar.gz
+libgnome-java-2.12.0.tar.gz


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgnome-java.spec	20 May 2005 05:05:23 -0000	1.18
+++ libgnome-java.spec	24 Sep 2005 15:20:34 -0000	1.19
@@ -1,9 +1,21 @@
-%define	name		libgnome-java
-%define	version		2.10.1
-%define	release		3
+# install these packages into /opt if we have a prefix defined for the
+# java packages
+%{?java_pkg_prefix: %define _prefix /opt }
+%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
+%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
+%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
+%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
+%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
+
+%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
+%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
+
+%define	name_base	libgnome-java
+%define	version		2.12.0
+%define	release		1
 
 Summary:	Java bindings for libgnome
-Name:		%{name}
+Name:		%{java_pkg_prefix}%{name_base}	
 Version:	%{version}
 Release:	%{release}
 License:	LGPL
@@ -12,11 +24,13 @@
 Source:		%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libgnome >= 2.8.0
-BuildRequires:  libgnome-devel >= 2.8.0, gcc-java >= 3.3.3, docbook-utils
-BuildRequires:  libgtk-java >= 2.6.0, java-devel >= 1.4.2
-# FIXME: remove this when eclipse-ecj builds on all platforms
-ExclusiveArch:	i386 ppc x86_64
+Requires:	libgnome >= 2.10.0
+Requires:	libgtk-java >= 2.8.0
+Requires: 	glib-java >= 0.2
+BuildRequires:  libgnome-devel >= 2.10.0, gcc-java >= 3.3.3, docbook-utils
+BuildRequires:  libgtk-java >= 2.8.0, java-devel >= 1.4.2
+BuildRequires:	glib-java >= 0.2
+
 
 %description
 libgnome-java is a language binding that allows developers to write
@@ -32,18 +46,21 @@
 applications with IDEs like Eclipse.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name_base}-%{version}
 
 %build
+# if either the C or Java packages has a prefix declared, then we will
+# add /opt/lib/pkgconfig to the pkgconfig path
+if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
+        export PKG_CONFIG_PATH=/opt/lib/pkgconfig
+fi
+
 %configure
-# FIXME: find a better solution for this
-sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool 
-sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool 
 make
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/lib//")
+jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
 zip -9 -r $zipfile $(find -name \*.java)
@@ -54,9 +71,14 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# rename doc dir to reflect package rename, if the names differ
+if [ 'x%{name_base}' != 'x%{name}' ] ; then
+        mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
+fi
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/lib//")
+jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 install -m 644 $jarname$jarversion-src-%{version}.zip $RPM_BUILD_ROOT%{_datadir}/java/
 pushd $RPM_BUILD_ROOT%{_datadir}/java
 ln -sf $jarname$jarversion-src-%{version}.zip $jarname$jarversion-src.zip
@@ -84,6 +106,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Sep 24 2005 Igor Foox <ifoox at redhat.com> - 2.12.0-1
+- Import libgnome-java 2.12.0.
+
 * Fri May 20 2005 Ben Konrath <bkonrath at redhat.com> - 2.10.1-3
 - Fix permission on src zip.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Apr 2005 19:14:04 -0000	1.8
+++ sources	24 Sep 2005 15:20:34 -0000	1.9
@@ -1 +1 @@
-fed25d0e83bd62dc0667ed85a4bd1ec8  libgnome-java-2.10.1.tar.gz
+852c88ec9edc61f70307daa5b12bc873  libgnome-java-2.12.0.tar.gz


--- libgnome-java-install.patch DELETED ---


--- libgnome-java-run-example.patch DELETED ---