From 48b8818c620b31f95d0cc0ecbf5fce1163e1a0b5 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 16 Jun 2011 16:05:36 +0200 Subject: make some libs private in pkgconfig file (#712990) --- guile-1.8.6-deplibs.patch | 48 -------------------------------------- guile-1.8.8-deplibs.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++ guile.spec | 7 ++++-- 3 files changed, 64 insertions(+), 50 deletions(-) delete mode 100644 guile-1.8.6-deplibs.patch create mode 100644 guile-1.8.8-deplibs.patch diff --git a/guile-1.8.6-deplibs.patch b/guile-1.8.6-deplibs.patch deleted file mode 100644 index 6bc164d..0000000 --- a/guile-1.8.6-deplibs.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 -@@ -152,10 +152,10 @@ - (list - (get-build-info 'CFLAGS) - (if (or (string=? libdir "/usr/lib") -- (string=? libdir "/usr/lib/")) -+ (string=? libdir "/usr/lib64")) - "" - (string-append "-L" (get-build-info 'libdir))) -- "-lguile -lltdl" -+ "-lguile" - (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 \ - - libguile_la_DEPENDENCIES = @LIBLOBJS@ - libguile_la_LIBADD = @LIBLOBJS@ --libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined -+libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined -pthread - - # These are headers visible as - pkginclude_HEADERS = gh.h -@@ -2026,8 +2026,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 -- @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp -- @echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp -+ @echo ' { "srcdir", "" }, \' >> libpath.tmp -+ @echo ' { "top_srcdir", "" }, \' >> libpath.tmp - @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_ - @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp - @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \ - >> libpath.tmp -- @echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp -+ @echo ' { "LIBS", "" }, \' >> libpath.tmp - @echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp - @echo ' { "buildstamp", "'"`date`"'" }, \' >> libpath.tmp - @echo '}' >> libpath.tmp diff --git a/guile-1.8.8-deplibs.patch b/guile-1.8.8-deplibs.patch new file mode 100644 index 0000000..b9fa9ca --- /dev/null +++ b/guile-1.8.8-deplibs.patch @@ -0,0 +1,59 @@ +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) + (if (or (string=? libdir "/usr/lib") +- (string=? libdir "/usr/lib/")) ++ (string=? libdir "/usr/lib64")) + "" + (string-append "-L" (get-build-info 'libdir))) +- "-lguile -lltdl" ++ "-lguile" + (string-join other-flags) + + ))) +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@ +-libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined ++libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined -pthread + + # These are headers visible as + pkginclude_HEADERS = gh.h +@@ -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 +- @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp +- @echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp ++ @echo ' { "srcdir", "" }, \' >> libpath.tmp ++ @echo ' { "top_srcdir", "" }, \' >> libpath.tmp + @echo ' { "prefix", "@prefix@" }, \' >> libpath.tmp + @echo ' { "exec_prefix", "@exec_prefix@" }, \' >> libpath.tmp + @echo ' { "bindir", "@bindir@" }, \' >> libpath.tmp +@@ -2153,7 +2153,7 @@ libpath.h: $(srcdir)/Makefile.in $(top_ + @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp + @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \ + >> libpath.tmp +- @echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp ++ @echo ' { "LIBS", "" }, \' >> libpath.tmp + @echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp + @echo ' { "buildstamp", "'"`date`"'" }, \' >> libpath.tmp + @echo '}' >> 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 - 5:1.8.8-3 +- make some libs private in pkgconfig file (#712990) + * Wed Feb 09 2011 Fedora Release Engineering - 5:1.8.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -- cgit