make some libs private in pkgconfig file (#712990)

2 files changed, 25 insertions, 11 deletions

diff --git a/guile-1.8.6-deplibs.patch b/guile-1.8.8-deplibs.patch
index 6bc164d..b9fa9ca 100644
--- a/guile-1.8.6-deplibs.patch
+++ b/guile-1.8.8-deplibs.patch
@@ -1,6 +1,17 @@
-diff -up guile-1.8.6/guile-config/guile-config.in.deplibs guile-1.8.6/guile-config/guile-config.in
---- guile-1.8.6/guile-config/guile-config.in.deplibs	2008-12-04 19:30:41.000000000 +0100
-+++ guile-1.8.6/guile-config/guile-config.in	2008-12-09 12:17:48.000000000 +0100
+diff -up guile-1.8.8/guile-1.8.pc.in.deplibs guile-1.8.8/guile-1.8.pc.in
+--- guile-1.8.8/guile-1.8.pc.in.deplibs	2010-12-13 18:24:39.000000000 +0100
++++ guile-1.8.8/guile-1.8.pc.in	2011-06-16 15:37:57.614346208 +0200
+@@ -11,5 +11,6 @@ libguileinterface=@LIBGUILE_INTERFACE@
+ Name: GNU Guile
+ Description: GNU's Ubiquitous Intelligent Language for Extension
+ Version: @GUILE_VERSION@
+-Libs: -L${libdir} -lguile @GUILE_LIBS@
++Libs: -L${libdir} -lguile
++Libs.private: @GUILE_LIBS@
+ Cflags: -I${includedir} @GUILE_CFLAGS@
+diff -up guile-1.8.8/guile-config/guile-config.in.deplibs guile-1.8.8/guile-config/guile-config.in
+--- guile-1.8.8/guile-config/guile-config.in.deplibs	2010-12-13 18:24:39.000000000 +0100
++++ guile-1.8.8/guile-config/guile-config.in	2010-12-14 13:49:50.703230447 +0100
 @@ -152,10 +152,10 @@
  	      (list
  	       (get-build-info 'CFLAGS)
@@ -14,10 +25,10 @@ diff -up guile-1.8.6/guile-config/guile-config.in.deplibs guile-1.8.6/guile-conf
  	       (string-join other-flags)
  
  	       )))
-diff -up guile-1.8.6/libguile/Makefile.in.deplibs guile-1.8.6/libguile/Makefile.in
---- guile-1.8.6/libguile/Makefile.in.deplibs	2008-12-09 12:15:36.000000000 +0100
-+++ guile-1.8.6/libguile/Makefile.in	2008-12-09 12:15:36.000000000 +0100
-@@ -456,7 +456,7 @@ noinst_HEADERS = convert.i.c					\
+diff -up guile-1.8.8/libguile/Makefile.in.deplibs guile-1.8.8/libguile/Makefile.in
+--- guile-1.8.8/libguile/Makefile.in.deplibs	2010-12-14 13:49:50.698230252 +0100
++++ guile-1.8.8/libguile/Makefile.in	2010-12-14 13:49:50.705230526 +0100
+@@ -471,7 +471,7 @@ noinst_HEADERS = convert.i.c					\
  
  libguile_la_DEPENDENCIES = @LIBLOBJS@
  libguile_la_LIBADD = @LIBLOBJS@
@@ -26,7 +37,7 @@ diff -up guile-1.8.6/libguile/Makefile.in.deplibs guile-1.8.6/libguile/Makefile.
  
  # These are headers visible as <guile/mumble.h>
  pkginclude_HEADERS = gh.h
-@@ -2026,8 +2026,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
+@@ -2131,8 +2131,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
  	@echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
  	@echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
  	@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
@@ -37,7 +48,7 @@ diff -up guile-1.8.6/libguile/Makefile.in.deplibs guile-1.8.6/libguile/Makefile.
  	@echo '	{ "prefix",	   "@prefix@" }, \' >> libpath.tmp
  	@echo '	{ "exec_prefix",   "@exec_prefix@" }, \' >> libpath.tmp
  	@echo '	{ "bindir",	   "@bindir@" }, \' >> libpath.tmp
-@@ -2048,7 +2048,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
+@@ -2153,7 +2153,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
  	@echo '	{ "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
  	@echo '	{ "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
  		>> libpath.tmp
diff --git a/guile.spec b/guile.spec
index 2e2c4f5..c977e3f 100644
--- a/guile.spec
+++ b/guile.spec
@@ -4,12 +4,12 @@ Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
 %define mver 1.8
 Version: 1.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
 Patch1: guile-1.8.7-multilib.patch
 Patch2: guile-1.8.7-testsuite.patch
-Patch4: guile-1.8.6-deplibs.patch
+Patch4: guile-1.8.8-deplibs.patch
 License: GPLv2+ and LGPLv2+ and GFDL and OFSFDL
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -169,6 +169,9 @@ fi
 %{_includedir}/libguile.h
 
 %changelog
+* Thu Jun 16 2011 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.8-3
+- make some libs private in pkgconfig file (#712990)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:1.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild