[packages/guile-gnome-platform] - updated to 2.16.4 - updated link patch to cover mime functions moved from libgnomevfs to libbonobo

[qboosh]

commit f410b55e37583def74d54dad2400e886500c3042
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 29 20:31:32 2016 +0100

    - updated to 2.16.4
    - updated link patch to cover mime functions moved from libgnomevfs to libbonobo-activation
    - removed obsolete glib patch

 guile-gnome-platform-glib.patch | 11 -----------
 guile-gnome-platform-link.patch | 11 +++++++++++
 guile-gnome-platform.spec       | 25 ++++++++++++-------------
 3 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/guile-gnome-platform.spec b/guile-gnome-platform.spec
index 6225cc5..12979c6 100644
--- a/guile-gnome-platform.spec
+++ b/guile-gnome-platform.spec
@@ -5,28 +5,27 @@
 Summary:	guile-gnome platform
 Summary(pl.UTF-8):	Platforma guile-gnome
 Name:		guile-gnome-platform
-Version:	2.16.2
+Version:	2.16.4
 Release:	1
 License:	GPL v2+
 Group:		Development/Languages/Scheme
 Source0:	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/%{name}-%{version}.tar.gz
-# Source0-md5:	eb4a084d13785efaa1639145907a87b4
+# Source0-md5:	930178554957a25209c6ca0adeb3a584
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-make.patch
-Patch3:		%{name}-glib.patch
 URL:		http://www.gnu.org/software/guile-gnome/
 BuildRequires:	GConf2-devel >= 2.18
 BuildRequires:	atk-devel >= 1:1.12
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	g-wrap-devel >= 2:1.9.14
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.12
+BuildRequires:	g-wrap-devel >= 2:1.9.15
 BuildRequires:	gdk-pixbuf2-devel >= 2.10.0
 BuildRequires:	glib2-devel >= 1:2.10.0
 %{?with_gnome:BuildRequires:	gnome-vfs2-devel >= 2.16.0}
 BuildRequires:	gtk+2-devel >= 2:2.10.0
 BuildRequires:	guile-cairo-devel
-BuildRequires:	guile-devel >= 5:1.8.0
+BuildRequires:	guile-devel >= 5:2.0
 %{?with_gnome:BuildRequires:	libbonobo-devel >= 2.0}
 BuildRequires:	libglade2-devel >= 1:2.6
 %{?with_gnome:BuildRequires:	libgnome-devel >= 2.16}
@@ -36,7 +35,7 @@ BuildRequires:	libtool
 BuildRequires:	pango-devel >= 1:1.14
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	texinfo
-Requires:	guile >= 5:1.8.0
+Requires:	guile >= 5:2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -148,7 +147,7 @@ Summary(pl.UTF-8):	Platforma gnome-guile - moduł GLib/GObject
 Group:		Libraries
 Requires(post,postun):	/sbin/ldconfig
 Requires:	%{name} = %{version}-%{release}
-Requires:	g-wrap >= 2:1.9.14
+Requires:	g-wrap >= 2:1.9.15
 Requires:	glib2 >= 1:2.10.0
 
 %description -n guile-gnome-glib
@@ -164,7 +163,7 @@ Summary:	Header files for guile-gnome-glib library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki guile-gnome-glib
 Group:		Development/Libraries
 Requires:	guile-gnome-glib = %{version}-%{release}
-Requires:	g-wrap-devel >= 2:1.9.14
+Requires:	g-wrap-devel >= 2:1.9.15
 Requires:	glib2-devel >= 1:2.10.0
 Requires:	guile-devel >= 1:1.8.0
 
@@ -265,7 +264,6 @@ międzynarodowego tekstu.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -283,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libguile-gnome-*.la
+# dlopened modules
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/guile-gnome-2/libgw-guile-gnome-*.la
 # example module
 %{?with_gnome:%{__rm} $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Foo_module.*}
@@ -422,7 +423,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n guile-gnome-corba-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libguile-gnome-corba-2.so
-%{_libdir}/libguile-gnome-corba-2.la
 %{_includedir}/guile-gnome-2/guile-gnome-corba
 %endif
 
@@ -462,7 +462,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n guile-gnome-glib-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libguile-gnome-gobject-2.so
-%{_libdir}/libguile-gnome-gobject-2.la
 %dir %{_includedir}/guile-gnome-2
 %{_includedir}/guile-gnome-2/guile-gnome-gobject.h
 %{_includedir}/guile-gnome-2/guile-gnome-gobject
diff --git a/guile-gnome-platform-glib.patch b/guile-gnome-platform-glib.patch
deleted file mode 100644
index f7a83a8..0000000
--- a/guile-gnome-platform-glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h.orig	2012-05-07 17:29:35.000000000 +0200
-+++ guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h	2012-05-26 09:05:47.617222958 +0200
-@@ -24,7 +24,7 @@
- #ifndef __GUILE_SUPPORT_H__
- #define __GUILE_SUPPORT_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <libguile.h>
- 
diff --git a/guile-gnome-platform-link.patch b/guile-gnome-platform-link.patch
index e43b653..76b8918 100644
--- a/guile-gnome-platform-link.patch
+++ b/guile-gnome-platform-link.patch
@@ -9,3 +9,14 @@
  libguile_gnome_corba_ at API_VERSION@_la_LDFLAGS = -export-dynamic # FIXME: version info
  
  guile_gnome_includedir = $(includedir)/guile-gnome- at API_VERSION@
+--- guile-gnome-platform-2.16.4/gnome-vfs/gnome/gw/Makefile.am.orig	2015-01-24 15:07:42.000000000 +0100
++++ guile-gnome-platform-2.16.4/gnome-vfs/gnome/gw/Makefile.am	2016-02-29 18:57:24.314595083 +0100
+@@ -20,7 +20,7 @@
+ 	$(AM_CFLAGS) $(GNOME_VFS_CFLAGS) $(GUILE_CFLAGS) \
+ 	$(G_WRAP_CFLAGS) $(GNOME_VFS_DEPRECATED_CFLAGS)
+ 
+-libgw_guile_gnome_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(GUILE_LIBS) \
++libgw_guile_gnome_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) -lbonobo-activation $(GUILE_LIBS) \
+ 	$(G_WRAP_LIBS) $(GUILE_GLIB_LIBS)
+ 
+ libgw_guile_gnome_gnome_vfs_la_LDFLAGS = -module
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guile-gnome-platform.git/commitdiff/f410b55e37583def74d54dad2400e886500c3042