rpms/libgtk-java/devel .cvsignore, 1.10, 1.11 libgtk-java.spec, 1.28, 1.29 sources, 1.10, 1.11 libgtk-java-action-group.patch, 1.1, NONE libgtk-java-docs-inst.patch, 1.1, NONE libgtk-java-m4-macros.patch, 1.1, NONE libgtk-java-run-example.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Sep 24 00:17:58 UTC 2005 

Author: ifoox

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

Modified Files:
	.cvsignore libgtk-java.spec sources 
Removed Files:
	libgtk-java-action-group.patch libgtk-java-docs-inst.patch 
	libgtk-java-m4-macros.patch libgtk-java-run-example.patch 
Log Message:
Updated to upstream version of libgtk-java 2.8.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Apr 2005 21:11:57 -0000	1.10
+++ .cvsignore	24 Sep 2005 00:17:55 -0000	1.11
@@ -1 +1,2 @@
 libgtk-java-2.6.2.tar.gz
+libgtk-java-2.8.0.tar.gz


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgtk-java.spec	20 May 2005 04:16:41 -0000	1.28
+++ libgtk-java.spec	24 Sep 2005 00:17:55 -0000	1.29
@@ -1,28 +1,43 @@
-%define	name		libgtk-java
-%define	version		2.6.2
+# 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 	libgtk-java
+%define	version		2.8.0
 %define	release		3
 
+
 Summary:	Java bindings for GTK+
-Name:		%{name}
+Name:		%{java_pkg_prefix}%{name_base}
 Version:	%{version}
 Release:	%{release}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+Source:		%{name_base}-%{version}.tar.gz
 
-Requires:	gtk2 >= 2.6.0
-BuildRequires:  gtk2-devel >= 2.6.0, gcc-java >= 3.3.3, docbook-utils
-BuildRequires:	java-devel >= 1.4.2
-# FIXME: remove this when eclipse-ecj builds on all platforms
-ExclusiveArch:	i386 ppc x86_64
+BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
+
+Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.0
+Requires:       %{java_pkg_prefix}glib-java >= 0.2
+BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
+BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
 
 %description
 libgtk-java is a language binding that allows developers to write GTK
 applications in Java.  It is part of Java-GNOME.
 
-%package       	devel
+%package        devel
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
@@ -32,36 +47,51 @@
 applications with IDEs like Eclipse.
 
 %prep
-%setup -q -n %{name}-%{version}
 
-%build
+%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
+
+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)
 popd
 
+pushd doc
+  mv FAQ.html ..
+popd
+
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+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
 popd
 
+
 %post
 /sbin/ldconfig
 
@@ -73,21 +103,25 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING doc/examples doc/FAQ.html NEWS README THANKS
+%doc doc/api AUTHORS COPYING INSTALL README NEWS  THANKS FAQ.html doc/examples
+%dir %{_includedir}/%{name_base}
+%{_includedir}/%{name_base}/*
 %{_libdir}/*so*
 %{_libdir}/*la
 %{_libdir}/pkgconfig/*
-%dir %{_includedir}/libgtk-java
-%{_includedir}/libgtk-java/*
 %{_datadir}/java/*.jar
-%dir %{_datadir}/libgtk-java
-%{_datadir}/libgtk-java/*
+%dir %{_datadir}/%{name_base}
+%{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
 %{_datadir}/java/*.zip
 
+
 %changelog
+* Fri Sep 23 2005 Igor Foox <ifoox at redhat.com> - 2.8.0-3
+- Updated to 2.8.0 upstream libgtk-java.
+
 * Fri May 20 2005 Ben Konrath <bkonrath at redhat.com> - 2.6.2-3
 - Fix permissions of src zip.
 
@@ -162,3 +196,4 @@
 - Few cleanups.
 * Fri Oct 08 2004 Luca De Rugeriis <piedamaro at fastwebnet.it> 2.4.3-1
 - Initial release.
+                                                              164,1         Bo


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Apr 2005 21:11:57 -0000	1.10
+++ sources	24 Sep 2005 00:17:55 -0000	1.11
@@ -1 +1 @@
-bd4767f842712bf0bf8cee643ac69d55  libgtk-java-2.6.2.tar.gz
+4f7dd8192c84e69b3fe6b4539f42ecf9  libgtk-java-2.8.0.tar.gz


--- libgtk-java-action-group.patch DELETED ---


--- libgtk-java-docs-inst.patch DELETED ---


--- libgtk-java-m4-macros.patch DELETED ---


--- libgtk-java-run-example.patch DELETED ---

More information about the fedora-cvs-commits mailing list