* SUNWgnome-config-java.spec:
updated to build against modified SUNWgnome-base-libs-java.
* SUNWgnome-terminal-java.spec:
updated to build against modified SUNWgnome-base-libs-java.
* gnome-config-java-04-installpaths.diff:
patch for install dirs for jar location on Solaris
* gnome-terminal-java-01-installpaths.diff:
patch for install dirs for jar location on Solaris
* SUNWgnome-base-libs-java.spec: Remove INSTALLED_CLASSPATH and
INSTALLED_MACRODIR, not required
* glib2-java.spec: add install dir patch
* glib2-java-03-installpaths.diff
patch for install dirs for jar location on Solaris
* cairo-java.spec: add install dir patch
* cairo-java-02-installpaths.diff
patch for install dirs for jar location on Solaris
* gtk2-java.spec: add install dir patch
* gtk2-java-03-installpaths.diff
patch for install dirs for jar location on Solaris
* gnome-libs-java.spec: add install dir patch
* gnome-libs-java-0j3-installpaths.diff
patch for install dirs for jar location on Solaris
* glade-java.spec: add install dir patch
* glade-java-02-installpaths.diff
patch for install dirs for jar location on Solaris
--- a/ChangeLog Mon Oct 02 17:09:13 2006 +0000
+++ b/ChangeLog Mon Oct 02 20:18:37 2006 +0000
@@ -1,3 +1,21 @@
+2006-10-02 John Rice - <[email protected]>
+
+ * glib2-java.spec: add install dir patch
+ * glib2-java-03-installpaths.diff
+ patch for install dirs for jar location on Solaris
+ * cairo-java.spec: add install dir patch
+ * cairo-java-02-installpaths.diff
+ patch for install dirs for jar location on Solaris
+ * gtk2-java.spec: add install dir patch
+ * gtk2-java-03-installpaths.diff
+ patch for install dirs for jar location on Solaris
+ * gnome-libs-java.spec: add install dir patch
+ * gnome-libs-java-0j3-installpaths.diff
+ patch for install dirs for jar location on Solaris
+ * glade-java.spec: add install dir patch
+ * glade-java-02-installpaths.diff
+ patch for install dirs for jar location on Solaris
+
2006-10-02 Damien Carbery <[email protected]>
* gnome-themes.spec: Bump to 2.16.1.
--- a/Solaris/ChangeLog Mon Oct 02 17:09:13 2006 +0000
+++ b/Solaris/ChangeLog Mon Oct 02 20:18:37 2006 +0000
@@ -1,3 +1,16 @@
+2006-10-02 John Rice - <[email protected]>
+
+ * SUNWgnome-config-java.spec:
+ updated to build against modified SUNWgnome-base-libs-java.
+ * SUNWgnome-terminal-java.spec:
+ updated to build against modified SUNWgnome-base-libs-java.
+ * gnome-config-java-04-installpaths.diff:
+ patch for install dirs for jar location on Solaris
+ * gnome-terminal-java-01-installpaths.diff:
+ patch for install dirs for jar location on Solaris
+ * SUNWgnome-base-libs-java.spec: Remove INSTALLED_CLASSPATH and
+ INSTALLED_MACRODIR, not required
+
2006-10-02 Damien Carbery <[email protected]>
* SUNWgnome-base-libs-java.spec: Correct group for %{_datadir}/lib.
--- a/Solaris/SUNWgnome-base-libs-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/Solaris/SUNWgnome-base-libs-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -54,8 +54,6 @@
export JAVA_HOME=/usr/java
export CFLAGS="-I/usr/java/include/solaris"
-export INSTALLED_CLASSPATH="/usr/share/lib/java"
-export INSTALLED_MACRODIR="/usr/share/lib/java"
export ACLOCAL_FLAGS="-I %{_builddir}/%name-%version/glib-java-%{glibjava.version}/macros -I %{_builddir}/%name-%version/libgtk-java-%{gtkjava.version}/macros"
%glibjava.build -d %name-%version
@@ -160,6 +158,9 @@
%{_includedir}/libgtk-java/gtk_java.h
%changelog
+* Mon Oct 02 2006 - [email protected]
+- Remove INSTALLED_CLASSPATH and INSTALLED_MACRODIR, not required
+
* Mon Oct 02 2006 - [email protected]
- Correct group for %{_datadir}/lib (root:sys).
- Use global version for package version number.
--- a/Solaris/SUNWgnome-config-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/Solaris/SUNWgnome-config-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -20,18 +20,16 @@
Patch1: gnome-config-java-01-config.diff
Patch2: gnome-config-java-02-jni.diff
Patch3: gnome-config-java-03-example.diff
+Patch4: gnome-config-java-04-installpaths.diff
%include default-depend.inc
-Requires: SUNWgnome-base-libs >= 2.14
Requires: SUNWgnome-base-libs-java >= 2.14
-Requires: SUNWgnome-libs-java >= 2.12
Requires: SUNWbash
Requires: SUNWgnome-config
BuildRequires: SUNWgnome-base-libs-devel >= 2.14
BuildRequires: SUNWgnome-base-libs-java-devel >= 2.14
-BuildRequires: SUNWgnome-libs-java-devel >= 2.12
BuildRequires: SUNWgnome-config-devel
%package devel
@@ -46,15 +44,19 @@
This release series, collectively called java-gnome, consists of glib-java, cairo-java, libgtk-java, libglade-java, libgnome-java, and libgconf-java.
%prep
-# Extract sources from tarball
%setup -q -n libgconf-java-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
export JAVA_HOME=/usr/java
export CFLAGS="-I/usr/java/include/solaris"
+export ACLOCAL_FLAGS="-I /usr/share/lib/java/javadoc/java-gnome/glib-java/macros -I /usr/share/lib/java/javadoc/java-gnome/libgtk-java/macros"
+aclocal $ACLOCAL_FLAGS -I .
+automake -a -c -f
+autoconf
./configure --prefix=%{_prefix} \
--libexecdir=%{_libexecdir} \
@@ -70,10 +72,12 @@
# Default install is under %{_datadir}/doc need to move all docs and jars under
# %{_datadir}/lib/java/ for Solaris
-install -d $RPM_BUILD_ROOT%{_datadir}/lib
-mv $RPM_BUILD_ROOT%{_datadir}/java/ $RPM_BUILD_ROOT%{_datadir}/lib/
-install -d $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc
-mv $RPM_BUILD_ROOT%{_datadir}/doc/ $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome/
+install -d $RPM_BUILD_ROOT%{_datadir}/lib/java
+cp -r $RPM_BUILD_ROOT%{_datadir}/java/* $RPM_BUILD_ROOT%{_datadir}/lib/java/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/java
+install -d $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome
+cp -r $RPM_BUILD_ROOT%{_datadir}/doc/* $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
%clean
rm -rf $RPM_BUILD_ROOT
@@ -104,6 +108,11 @@
%{_datadir}/lib/java/javadoc/java-gnome/libgconf-java-%{version}/examples/*
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
+- Added aclocal macro flags
+
* Thur Sep 28 2006 - [email protected]
- Replaced mkdir with install -d
--- a/Solaris/SUNWgnome-terminal-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/Solaris/SUNWgnome-terminal-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -17,6 +17,7 @@
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://java-gnome.sourceforge.net
+Patch1: gnome-terminal-java-01-installpaths.diff
%include default-depend.inc
@@ -41,12 +42,16 @@
This release series, collectively called java-gnome, consists of glib-java, cairo-java, libvte-java, libglade-java, libgnome-java, and libgconf-java.
%prep
-# Extract sources from tarball
%setup -q -n libvte-java-%{version}
+%patch1 -p1
%build
export JAVA_HOME=/usr/java
export CFLAGS="-I/usr/java/include -I/usr/java/include/solaris"
+export ACLOCAL_FLAGS="-I /usr/share/lib/java/javadoc/java-gnome/glib-java/macros -I /usr/share/lib/java/javadoc/java-gnome/libgtk-java/macros"
+aclocal $ACLOCAL_FLAGS -I .
+automake -a -c -f
+autoconf
./configure --prefix=%{_prefix} \
--libexecdir=%{_libexecdir} \
@@ -63,10 +68,12 @@
# Default install is under %{_datadir}/doc need to move all docs and jars under
# %{_datadir}/lib/java/ for Solaris
-install -d $RPM_BUILD_ROOT%{_datadir}/lib
-mv $RPM_BUILD_ROOT%{_datadir}/java/ $RPM_BUILD_ROOT%{_datadir}/lib/
-install -d $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc
-mv $RPM_BUILD_ROOT%{_datadir}/doc/ $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome/
+install -d $RPM_BUILD_ROOT%{_datadir}/lib/java
+cp -r $RPM_BUILD_ROOT%{_datadir}/java/* $RPM_BUILD_ROOT%{_datadir}/lib/java/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/java
+install -d $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome
+cp -r $RPM_BUILD_ROOT%{_datadir}/doc/* $RPM_BUILD_ROOT%{_datadir}/lib/java/javadoc/java-gnome/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,6 +104,11 @@
%{_datadir}/lib/java/javadoc/java-gnome/libvte-java-%{version}/examples/*
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
+- Added aclocal macro flags
+
* Thur Sep 28 2006 - [email protected]
- Replaced mkdir with install -d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/cairo-java-02-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,12 @@
+diff -uNr cairo-java-1.0.5.orig/configure.ac cairo-java-1.0.5/configure.ac
+--- cairo-java-1.0.5.orig/configure.ac 2006-09-29 10:26:54.027624000 +0100
++++ cairo-java-1.0.5/configure.ac 2006-09-29 10:27:32.866305000 +0100
+@@ -27,7 +27,7 @@
+
+ apiversion="1.0"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/cairo${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/cairo${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/glade-java-02-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,12 @@
+diff -uNr libglade-java-2.12.6.orig/configure.ac libglade-java-2.12.6/configure.ac
+--- libglade-java-2.12.6.orig/configure.ac 2006-09-29 10:32:53.796366000 +0100
++++ libglade-java-2.12.6/configure.ac 2006-09-29 10:33:28.370781000 +0100
+@@ -29,7 +29,7 @@
+ apiversion="2.12"
+ WINDOWS_LIB_VERSION="2-12"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/glade${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/glade${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/glib2-java-03-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,15 @@
+diff -uNr glib-java-0.3.2.orig/configure.ac glib-java-0.3.2/configure.ac
+--- glib-java-0.3.2.orig/configure.ac 2006-09-29 10:17:12.918195000 +0100
++++ glib-java-0.3.2/configure.ac 2006-09-29 10:21:55.466194000 +0100
+@@ -30,9 +30,9 @@
+ AC_SUBST(apiversion)
+ WINDOWS_LIB_VERSION="0-4"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/glib${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/glib${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+-INSTALLED_MACRO_DIR=\${prefix}/share/glib-java/macros/
++INSTALLED_MACRO_DIR=\${prefix}/share/lib/java/javadoc/java-gnome/glib-java/macros/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
+ AC_SUBST(INSTALLED_MACRO_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/gnome-config-java-04-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,12 @@
+diff -uNr libgconf-java-2.12.4.orig/configure.ac libgconf-java-2.12.4/configure.ac
+--- libgconf-java-2.12.4.orig/configure.ac 2006-10-02 20:14:56.760791000 +0100
++++ libgconf-java-2.12.4/configure.ac 2006-10-02 20:15:33.285297000 +0100
+@@ -27,7 +27,7 @@
+
+ apiversion="2.12"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gconf${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/gconf${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/gnome-libs-java-03-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,12 @@
+diff -uNr libgnome-java-2.12.5.orig/configure.ac libgnome-java-2.12.5/configure.ac
+--- libgnome-java-2.12.5.orig/configure.ac 2006-10-02 19:52:32.971409000 +0100
++++ libgnome-java-2.12.5/configure.ac 2006-10-02 19:53:27.124054000 +0100
+@@ -27,7 +27,7 @@
+
+ apiversion="2.12"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gnome${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/gnome${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/gnome-terminal-java-01-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,12 @@
+diff -uNr libvte-java-0.12.1.orig/configure.ac libvte-java-0.12.1/configure.ac
+--- libvte-java-0.12.1.orig/configure.ac 2006-10-02 20:37:31.100286000 +0100
++++ libvte-java-0.12.1/configure.ac 2006-10-02 20:38:09.847530000 +0100
+@@ -27,7 +27,7 @@
+
+ apiversion="0.12"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/vte${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/vte${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ INSTALLED_MACRO_DIR=\${prefix}/share/libvte-java/macros/
+ AC_SUBST(INSTALLED_CLASSPATH)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/gtk2-java-03-installpaths.diff Mon Oct 02 20:18:37 2006 +0000
@@ -0,0 +1,15 @@
+diff -uNr libgtk-java-2.9.3.orig/configure.ac libgtk-java-2.9.3/configure.ac
+--- libgtk-java-2.9.3.orig/configure.ac 2006-09-29 10:29:43.213899000 +0100
++++ libgtk-java-2.9.3/configure.ac 2006-09-29 10:30:59.239124000 +0100
+@@ -30,9 +30,9 @@
+ AC_SUBST(gtkapiversion)
+ WINDOWS_LIB_VERSION="2-10"
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gtk${gtkapiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/lib/java/gtk${gtkapiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+-INSTALLED_MACRO_DIR=\${prefix}/share/libgtk-java/macros/
++INSTALLED_MACRO_DIR=\${prefix}/share/lib/java/javadoc/java-gnome/libgtk-java/macros/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
+ AC_SUBST(INSTALLED_MACRO_DIR)
--- a/cairo-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/cairo-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -23,6 +23,9 @@
Autoreqprov: on
Patch1: cairo-java-01-uninstalled.diff
+%ifos solaris
+Patch2: cairo-java-02-installpaths.diff
+%endif
Requires: glib2-java >= 0.3.2
Requires: cairo >= 1.2.4
@@ -40,6 +43,9 @@
%prep
%setup -q -n cairo-java-%{version}
%patch1 -p1
+%ifos solaris
+%patch2 -p1
+%endif
%build
aclocal $ACLOCAL_FLAGS -I .
@@ -90,6 +96,10 @@
%{_datadir}/doc/cairo-java-%{version}/INSTALL
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
+
* Thur Sep 28 2006 - [email protected]
- Initial spec
--- a/glade-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/glade-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -25,6 +25,7 @@
%ifos solaris
Patch1: glade-java-01-config.diff
+Patch2: glade-java-02-installpaths.diff
%endif
Requires: glib2 >= 2.0
@@ -54,6 +55,7 @@
%setup -q -n libglade-java-%{version}
%ifos solaris
%patch1 -p1
+%patch2 -p1
%endif
%build
@@ -106,6 +108,9 @@
%{_datadir}/doc/libglade-java-%{version}/examples/*
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
* Thur Sep 28 2006 - [email protected]
- Initial spec
--- a/glib2-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/glib2-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -29,6 +29,9 @@
Patch1: glib2-java-01-pointer.diff
%endif
Patch2: glib2-java-02-uninstalled.diff
+%ifos solaris
+Patch3: glib2-java-03-installpaths.diff
+%endif
Requires: glib2 >= 2.0
BuildRequires: glib2 >= 2.0
@@ -48,6 +51,9 @@
%patch1 -p1
%endif
%patch2 -p1
+%ifos solaris
+%patch3 -p1
+%endif
%build
aclocal $ACLOCAL_FLAGS -I .
@@ -114,6 +120,10 @@
%{_includedir}/glib-java/glib_java.h
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
+
* Thur Sep 28 2006 - [email protected]
- Initial spec
--- a/gnome-libs-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/gnome-libs-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -26,6 +26,9 @@
Patch1: gnome-libs-java-01-example.diff
%endif
Patch2: gnome-libs-java-02-uninstalled.diff
+%ifos solaris
+Patch3: gnome-java-03-installpaths.diff
+%endif
Requires: gtk2-java >= 2.9.3
Requires: glib2-java >= 0.3.2
@@ -50,6 +53,9 @@
%patch1 -p1
%endif
%patch2 -p1
+%ifos solaris
+%patch3 -p1
+%endif
%build
aclocal $ACLOCAL_FLAGS -I .
@@ -103,5 +109,7 @@
%changelog
* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
- Initial spec
--- a/gtk2-java.spec Mon Oct 02 17:09:13 2006 +0000
+++ b/gtk2-java.spec Mon Oct 02 20:18:37 2006 +0000
@@ -29,6 +29,9 @@
Patch1: gtk2-java-01-example.diff
%endif
Patch2: gtk2-java-02-uninstalled.diff
+%ifos solaris
+Patch3: gtk2-java-03-installpaths.diff
+%endif
Requires: glib2-java >= 0.3.2
Requires: cairo-java >= 1.0.5
@@ -51,6 +54,9 @@
%patch1 -p1
%endif
%patch2 -p1
+%ifos solaris
+%patch3 -p1
+%endif
%build
aclocal $ACLOCAL_FLAGS -I .
@@ -112,6 +118,10 @@
%{_includedir}/libgtk-java/gtk_java.h
%changelog
+* Mon Oct 2 2006 - [email protected]
+- Added patch for install dirs for jar location on Solaris, better to have as
+ a configure option for all OS
+
* Thur Sep 28 2006 - [email protected]
- Initial spec