From fc0acbd66f16fc404b5fb59681d509ceaaed2abe Mon Sep 17 00:00:00 2001 From: cvs2git Date: Thu, 19 Feb 2004 22:03:25 +0000 Subject: [PATCH 1/4] This commit was manufactured by cvs2git to create branch 'DEVEL'. Sprout from master 2004-02-19 22:03:25 UTC grzegol '- moved from libgnome-java' Delete: java-libgnome.spec --- java-libgnome.spec | 84 ---------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 java-libgnome.spec diff --git a/java-libgnome.spec b/java-libgnome.spec deleted file mode 100644 index 0e63c31..0000000 --- a/java-libgnome.spec +++ /dev/null @@ -1,84 +0,0 @@ -%define pname libgnome-java -%define api 2.5 -%define gtkapi 2.3 -Summary: Java interface for libgnome -Summary(pl): Wrapper Java dla libgnome -Name: java-libgnome -Version: 2.5.5 -Release: 1 -License: LGPL -Group: Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{pname}/2.5/%{pname}-%{version}.tar.bz2 -# Source0-md5: ff75cd4398108c8ea8efaa8739a57495 -Patch0: %{name}-configure.patch -Patch1: %{name}-version_vars.patch -URL: http://java-gnome.sourceforge.net/ -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc-java >= 3.3.2 -BuildRequires: libgcj-devel >= 3.3.2 -BuildRequires: libgnomeui-devel >= 2.5.4 -BuildRequires: java-gtk-devel >= 2.3.5 -BuildRequires: slocate -Obsoletes: libgnome-java -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%description -Java interface for libgnome. - -%description -l pl -Wrapper Java dla libgnome. - -%package devel -Summary: Header files for java-libgnome library -Summary(pl): Pliki nagłówkowe biblioteki java-libgnome -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: libgnome-java-devel - -%description devel -Header files for java-libgnome library. - -%description devel -l pl -Pliki nagłówkowe biblioteki java-libgnome. - -%prep -%setup -q -n %{pname}-%{version} -%patch0 -p1 -%patch1 -p1 - -%build -version="%{version}"; export version -apiversion="%{api}"; export apiversion -gtkapiversion="%{gtkapi}"; export gtkapiversion -%{__autoconf} -%configure -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/java-gnome,%{_libdir}} - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -ln -sf gnome%{api}-%{version}.jar \ - $RPM_BUILD_ROOT%{_datadir}/java-gnome/gnome%{api}.jar -ln -sf libgnomejava%{api}.so.%{version} \ - $RPM_BUILD_ROOT%{_libdir}/libgnomejava%{api}.so - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%defattr(644,root,root,755) -%doc AUTHORS NEWS README THANKS TODO* -%attr(755,root,root) %{_libdir}/lib*.so.*.*.* - -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_datadir}/java-gnome/* From 0f8ee8c6acb8479a03f51bf1f5884abb5088342d Mon Sep 17 00:00:00 2001 From: grzegol Date: Wed, 21 Jul 2004 13:31:11 +0000 Subject: [PATCH 2/4] - fix installation Changed files: java-libgnome-install.patch -> 1.1.2.1 --- java-libgnome-install.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 java-libgnome-install.patch diff --git a/java-libgnome-install.patch b/java-libgnome-install.patch new file mode 100644 index 0000000..b5a780c --- /dev/null +++ b/java-libgnome-install.patch @@ -0,0 +1,20 @@ +diff -urN aa/libgnome-java-2.7.4/Makefile.in libgnome-java-2.7.4/Makefile.in +--- aa/libgnome-java-2.7.4/Makefile.in 2004-07-20 15:12:28.000000000 +0200 ++++ libgnome-java-2.7.4/Makefile.in 2004-07-21 15:19:17.691957328 +0200 +@@ -57,12 +57,15 @@ + + # Java-Gnome for use with a JVM + install: @GCJ_INSTALL_TARGETS@ ++ -$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig ++ -$(INSTALL) -d $(DESTDIR)$(datadir)/java ++ -$(INSTALL) -d $(DESTDIR)$(datadir)/doc/libgnome$(apiversion)-java + $(INSTALL) -s -m644 lib/libgnomejava$(apiversion).so.$(version) $(DESTDIR)$(libdir)/ + $(INSTALL) -m644 lib/gnome$(apiversion)-$(version).jar $(DESTDIR)$(datadir)/java + ln -s -f libgnomejava$(apiversion).so.$(version) $(DESTDIR)$(libdir)/libgnomejava$(apiversion).so + ln -s -f gnome$(apiversion)-$(version).jar $(DESTDIR)$(datadir)/java/gnome$(apiversion).jar + -for f in $(DOCUMENTS); do $(INSTALL) -m644 $$f $(DESTDIR)$(datadir)/doc/libgnome$(apiversion)-java || exit 1; done +- $(INSTALL) -m644 gnome2-java.pc $(libdir)/pkgconfig/ ++ $(INSTALL) -m644 gnome2-java.pc $(DESTDIR)$(libdir)/pkgconfig/ + + # Java-Gnome for use with applications compiled natively with gcj. + native_install: From 80b93aafd0f6a712afb0c814cf309a33fffbe094 Mon Sep 17 00:00:00 2001 From: grzegol Date: Wed, 21 Jul 2004 13:32:12 +0000 Subject: [PATCH 3/4] - outdated Changed files: java-libgnome-configure.patch -> 1.1.2.1 java-libgnome-version_vars.patch -> 1.1.2.1 --- java-libgnome-configure.patch | 28 ---------------------------- java-libgnome-version_vars.patch | 13 ------------- 2 files changed, 41 deletions(-) delete mode 100644 java-libgnome-configure.patch delete mode 100644 java-libgnome-version_vars.patch diff --git a/java-libgnome-configure.patch b/java-libgnome-configure.patch deleted file mode 100644 index 97dd0a8..0000000 --- a/java-libgnome-configure.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN aa/libgnome-java-2.5.3/configure.in libgnome-java-2.5.3/configure.in ---- aa/libgnome-java-2.5.3/configure.in 2004-01-19 22:44:49.000000000 +0100 -+++ libgnome-java-2.5.3/configure.in 2004-01-24 23:52:15.295642264 +0100 -@@ -50,8 +50,8 @@ - dnl them automatically - - --GTKJAR=$(DESTDIR)$(datadir)/java-gtk/gtk$(gtkapiversion).jar --NATIVEGTKJAR=$(DESTDIR)$(libdir)/libgtkjar$(gtkapiversion).so -+GTKJAR=${datadir}/java-gnome/gtk${gtkapiversion}.jar -+NATIVEGTKJAR=${libdir}/libgtkjar${gtkapiversion}.so - JG_GTK_LIB_PATH=../../gtk/lib/ - - dnl ------------------------------------------------------------------------ -@@ -61,11 +61,11 @@ - AC_SUBST(NATIVEGTKJAR) - AC_SUBST(JG_GTK_LIB_PATH) - --if !test -e $GTKJAR; then -+if ! test -e $GTKJAR; then - echo "GTK Jar file $GTKJAR not found."; - exit 8; - fi --if !test -e $NATIVEGTKJAR; then -+if ! test -e $NATIVEGTKJAR; then - echo "gcj compiled native jar file $NATIVEGTKJAR not found."; - exit 8; - fi diff --git a/java-libgnome-version_vars.patch b/java-libgnome-version_vars.patch deleted file mode 100644 index 3cdbfe8..0000000 --- a/java-libgnome-version_vars.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN aa/libgnome-java-2.5.4/configure.in libgnome-java-2.5.4/configure.in ---- aa/libgnome-java-2.5.4/configure.in 2004-02-04 01:55:17.000000000 +0100 -+++ libgnome-java-2.5.4/configure.in 2004-02-08 21:21:47.918767104 +0100 -@@ -35,6 +35,9 @@ - - AC_INIT(src/jni/org_gnu_gnome_Gnome.c) - -+AC_SUBST(version) -+AC_SUBST(apiversion) -+AC_SUBST(gtkapiversion) - - dnl Find already installed gnome modules - From 50d8800a9af5b08733a92cb8a094aaefdcd6b1ce Mon Sep 17 00:00:00 2001 From: grzegol Date: Wed, 21 Jul 2004 13:42:15 +0000 Subject: [PATCH 4/4] - outdated Changed files: java-libgnome-install.patch -> 1.1.2.2 --- java-libgnome-install.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 java-libgnome-install.patch diff --git a/java-libgnome-install.patch b/java-libgnome-install.patch deleted file mode 100644 index b5a780c..0000000 --- a/java-libgnome-install.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN aa/libgnome-java-2.7.4/Makefile.in libgnome-java-2.7.4/Makefile.in ---- aa/libgnome-java-2.7.4/Makefile.in 2004-07-20 15:12:28.000000000 +0200 -+++ libgnome-java-2.7.4/Makefile.in 2004-07-21 15:19:17.691957328 +0200 -@@ -57,12 +57,15 @@ - - # Java-Gnome for use with a JVM - install: @GCJ_INSTALL_TARGETS@ -+ -$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig -+ -$(INSTALL) -d $(DESTDIR)$(datadir)/java -+ -$(INSTALL) -d $(DESTDIR)$(datadir)/doc/libgnome$(apiversion)-java - $(INSTALL) -s -m644 lib/libgnomejava$(apiversion).so.$(version) $(DESTDIR)$(libdir)/ - $(INSTALL) -m644 lib/gnome$(apiversion)-$(version).jar $(DESTDIR)$(datadir)/java - ln -s -f libgnomejava$(apiversion).so.$(version) $(DESTDIR)$(libdir)/libgnomejava$(apiversion).so - ln -s -f gnome$(apiversion)-$(version).jar $(DESTDIR)$(datadir)/java/gnome$(apiversion).jar - -for f in $(DOCUMENTS); do $(INSTALL) -m644 $$f $(DESTDIR)$(datadir)/doc/libgnome$(apiversion)-java || exit 1; done -- $(INSTALL) -m644 gnome2-java.pc $(libdir)/pkgconfig/ -+ $(INSTALL) -m644 gnome2-java.pc $(DESTDIR)$(libdir)/pkgconfig/ - - # Java-Gnome for use with applications compiled natively with gcj. - native_install: