rpms/libglade-java/devel .cvsignore, 1.8, 1.9 libglade-java.spec, 1.16, 1.17 sources, 1.8, 1.9

Sun Sep 25 00:24:23 UTC 2005

Author: ifoox

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

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
Imported libglade-java 2.12.0 from upstream.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	12 Apr 2005 19:07:41 -0000	1.8
+++ .cvsignore	25 Sep 2005 00:24:21 -0000	1.9
@@ -1 +1 @@
-libglade-java-2.10.1.tar.gz
+libglade-java-2.12.0.tar.gz


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libglade-java.spec	20 May 2005 04:52:43 -0000	1.16
+++ libglade-java.spec	25 Sep 2005 00:24:21 -0000	1.17
@@ -1,29 +1,40 @@
-%define	name		libglade-java
-%define	version		2.10.1
-%define	release		5
+# 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	libglade-java
+%define	version		2.12.0
+%define release		3
 
 Summary:	Java bindings for libglade
-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
+Source:		%{name_base}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libglade2 >= 2.4.0
-BuildRequires:  libglade2-devel >= 2.4.0, gcc-java >= 3.3.3
-BuildRequires:	libgnome-java >= 2.8.2, libgtk-java >= 2.6.0
+Requires:	libglade2 >= 2.5.0
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.0
+BuildRequires:	%{java_pkg_prefix}libgtk-java >= 2.8.0
+BuildRequires:  libglade2-devel >= 2.5.0, gcc-java >= 3.3.3
 BuildRequires:	java-devel >= 1.4.2
-# FIXME: remove this when eclipse-ecj builds on all platforms
-ExclusiveArch:	i386 ppc x86_64
 
 %description
 libglade-java is a language binding that allows developers to write
 Java applications that use libglade.  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,19 +43,25 @@
 Compressed Java source for %{name}. This is useful if you are developing
 applications with IDEs like Eclipse.
 
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name_base}-%{version}
 
 %build
-%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 
+# 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=$PKG_CONFIG_PATH:/opt/lib/pkgconfig
+fi
+
+%configure %{configure_args}
+
+mkdir -p doc/api/
 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)
@@ -55,14 +72,20 @@
 
 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
 
@@ -85,8 +108,11 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Sep 24 2005 Igor Foox <ifoox at redhat.com> - 2.12.0-4
+- Imported libglade-java 2.12.0 from upstream.
+
 * Fri May 20 2005 Ben Konrath <bkonrath at redhat.com> - 2.10.1-5
-- Fix permissions of src zip. 
+- Fix permissions of src zip.
 
 * Thu May 19 2005 Ben Konrath <bkonrath at redhat.com> - 2.10.1-4
 - Add compressed java source to devel package.
@@ -133,3 +159,4 @@
 
 * Mon Nov  1 2004 Thomas Fitzsimmons <fitzsim at redhat.com> 2.8.1-1
 - Initial release.
+


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Apr 2005 19:07:41 -0000	1.8
+++ sources	25 Sep 2005 00:24:21 -0000	1.9
@@ -1 +1 @@
-8d45ba6bb57eafe544353a14439fd9a7  libglade-java-2.10.1.tar.gz
+547101981b7777949ac2c85ab3f324ee  libglade-java-2.12.0.tar.gz


