rpms/gnome-libs/F-11 gnome-libs-1.4.2-cleanlibs.patch, NONE, 1.1 gnome-libs-1.4.2-ppc64-config.patch, NONE, 1.1 gnome-libs.spec, 1.14, 1.15
Paul Howarth
pghmcfc at fedoraproject.org
Wed May 6 08:13:06 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/gnome-libs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20672
Modified Files:
gnome-libs.spec
Added Files:
gnome-libs-1.4.2-cleanlibs.patch
gnome-libs-1.4.2-ppc64-config.patch
Log Message:
* Thu Apr 9 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-14
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
rather than trying to use the system one
- Additional %{?_isa} devel package dependencies now available
- Clean up library linkage, linking libraries with the libs they need and only
those libs
- Fix config.guess and config.sub to support build on ppc64
gnome-libs-1.4.2-cleanlibs.patch:
--- NEW FILE gnome-libs-1.4.2-cleanlibs.patch ---
--- gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:45:31.000000000 +0100
+++ gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:44:49.000000000 +0100
@@ -3,6 +3,7 @@
supportexecincludedir = $(pkglibdir)/include
INCLUDES = -D_GNU_SOURCE
+LIBS =
lib_LTLIBRARIES = libgnomesupport.la
--- gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-15 20:53:02.000000000 +0100
+++ gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-17 11:01:32.000000000 +0100
@@ -22,6 +22,8 @@
-DVERSION=\""$(VERSION)"\" \
-DG_LOG_DOMAIN=\"Gnome\"
+LIBS =
+
libgnome_la_SOURCES = \
gnome-config.c \
gnome-dentry.c \
@@ -87,7 +89,7 @@
gnome-config.o: parse-path.cP
libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
-libgnome_la_LIBADD = $(GLIB_LIBS) -lm -ldb1
+libgnome_la_LIBADD = $(LIBSUPPORT) $(LIBGNOME_LIBS) -ldb1
bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
gconfigger gnome-gen-mimedb
--- gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-15 20:25:39.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-17 13:00:27.000000000 +0100
@@ -26,6 +26,8 @@
-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \
-DG_LOG_DOMAIN=\"GnomeUI\"
+LIBS =
+
EXTRA_HEADERS =
libgnomeui_la_SOURCES = \
@@ -269,7 +271,14 @@
$(man_MANS)
libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
-libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
+libgnomeui_la_BOGUSLIBS = -lesd -laudiofile -ldb1 -lgmodule -ldl -lXi -lXext -lz
+libgnomeui_la_LIBADD = \
+ $(top_builddir)/libgnome/libgnome.la \
+ $(top_builddir)/libart_lgpl/libart_lgpl.la \
+ $(filter-out $(libgnomeui_la_BOGUSLIBS), $(LIBGNOMEUI_LIBS))
+libgnomeui_la_DEPENDENCIES = \
+ $(top_builddir)/libgnome/libgnome.la \
+ $(top_builddir)/libart_lgpl/libart_lgpl.la
gnome_segv_LDADD = \
libgnomeui.la \
--- gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-15 20:57:57.000000000 +0100
+++ gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-17 12:15:49.000000000 +0100
@@ -27,6 +27,8 @@
-DGNOMESYSCONFDIR=\"$(sysconfdir)\" \
-DVERSION=\""$(VERSION)"\"
+LIBS =
+
gnome_factory_built=\
gnome-factory.h \
gnome-factory-skels.c \
@@ -80,7 +82,17 @@
Table.h
libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
+libgnorba_la_LIBADD = \
+ $(filter-out -lORBitutil -lm, $(ORBIT_LIBS)) \
+ $(top_builddir)/libgnomeui/libgnomeui.la \
+ $(top_builddir)/libgnome/libgnome.la \
+ $(filter-out -lesd -laudiofile -ldb1 -lgdk_imlib -lXi -lXext -lSM -lICE -lm, $(LIBGNOMEUI_LIBS))
+libgnorba_la_DEPENDENCIES = \
+ $(top_builddir)/libgnomeui/libgnomeui.la \
+ $(top_builddir)/libgnome/libgnome.la
+
+libgnorbagtk_la_LIBADD = $(filter-out -lORBitCosNaming -lORBitutil -lm, $(ORBIT_LIBS) $(X_LIBS) -lX11)
+libgnorbagtk_la_DEPENDENCIES =
loadshlib_SOURCES = loadshlib.c
--- gnome-libs-1.4.2/zvt/Makefile.am 2002-03-18 21:18:10.000000000 +0000
+++ gnome-libs-1.4.2/zvt/Makefile.am 2009-04-17 13:04:20.000000000 +0100
@@ -10,6 +10,8 @@
$(GDK_IMLIB_CFLAGS) \
-DGNOMESBINDIR=\""$(sbindir)"\"
+LIBS =
+
libzvt_la_SOURCES = \
gnome-login-support.h \
gnome-login-support.c \
@@ -22,6 +24,8 @@
zvtterm.c
libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir)
+libzvt_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext -lm, $(UTIL_LIBS) $(GTK_LIBS) $(GDK_IMLIB_LIBS))
+libzvt_la_DEPENDENCIES =
libzvtinclude_HEADERS = \
lists.h \
--- gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-15 21:20:41.000000000 +0100
+++ gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-17 13:18:04.000000000 +0100
@@ -54,7 +54,8 @@
toolkit.h
libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir)
-libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS)
+libgtkxmhtml_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext, $(LIBGTKXMHTML_LIBS))
+libgtkxmhtml_la_DEPENDENCIES =
noinst_PROGRAMS = htmltest
--- gnome-libs-1.4.2/ltmain.sh 2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/ltmain.sh 2002-06-06 12:27:06.000000000 +0100
@@ -615,6 +623,10 @@
# Now arrange that obj and lo_libobj become the same file
$show "(cd $xdir && $LN_S $baseobj $libobj)"
if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $run $rm "$lockfile"
+ fi
exit 0
else
error=$?
@@ -745,6 +757,7 @@
linker_flags=
dllsearchpath=
lib_search_path=`pwd`
+ inst_prefix_dir=
avoid_version=no
dlfiles=
@@ -875,6 +888,11 @@
prev=
continue
;;
+ inst_prefix)
+ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
release)
release="-$arg"
prev=
@@ -976,6 +994,11 @@
continue
;;
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+ ;;
+
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
# so, if we see these flags be careful not to treat them like -L
-L[A-Z][A-Z]*:*)
@@ -1530,8 +1564,6 @@
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
tmp_libs=
- #PKGW
- dependency_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
case "$tmp_libs " in
@@ -1647,8 +1679,6 @@
fi
tmp_libs=
- #PKGW
- dependency_libs=
for deplib in $dependency_libs; do
case $deplib in
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
@@ -1855,7 +1885,16 @@
if test "$hardcode_direct" = yes; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ add_dir=
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="-L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add_dir="$add_dir -L$libdir"
add="-l$name"
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
@@ -1865,7 +1904,17 @@
add="-l$name"
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ add_dir=
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="-L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add_dir="$add_dir -L$libdir"
+
add="-l$name"
fi
@@ -3622,8 +3682,9 @@
# relink executable if necessary
if test -n \"\$relink_command\"; then
- if (eval \$relink_command); then :
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
+ $echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
exit 1
fi
@@ -3827,7 +3888,7 @@
fi
done
# Quote the link command for shipping.
- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run.
@@ -4128,12 +4189,30 @@
dir="$dir$objdir"
if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ exit 1
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+ fi
+
$echo "$modename: warning: relinking \`$file'" 1>&2
$show "$relink_command"
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- continue
+ exit 1
fi
fi
gnome-libs-1.4.2-ppc64-config.patch:
--- NEW FILE gnome-libs-1.4.2-ppc64-config.patch ---
--- gnome-libs-1.4.2/config.guess 2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/config.guess 2009-04-21 15:07:58.000000000 +0100
@@ -811,6 +811,9 @@
rm -f $dummy.c $dummy
echo powerpc-unknown-linux-gnu${LIBC}
exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
alpha:Linux:*:*)
cat <<EOF >$dummy.s
.data
--- gnome-libs-1.4.2/config.sub 2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/config.sub 2009-04-21 15:09:15.000000000 +0100
@@ -721,6 +721,10 @@
;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
;;
Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/F-11/gnome-libs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gnome-libs.spec 5 Mar 2009 16:19:51 -0000 1.14
+++ gnome-libs.spec 6 May 2009 08:12:35 -0000 1.15
@@ -5,7 +5,7 @@
Name: gnome-libs
Epoch: 1
Version: 1.4.2
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: The main GNOME1 libraries
License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
Group: System Environment/Libraries
@@ -30,9 +30,9 @@ Requires: utempter
BuildRequires: zlib-devel
BuildRequires: imlib-devel%{?_isa}
BuildRequires: esound-devel%{?_isa}
-BuildRequires: ORBit-devel
+BuildRequires: ORBit-devel%{?_isa}
BuildRequires: glib-devel%{?_isa}
-BuildRequires: gtk+-devel
+BuildRequires: gtk+-devel%{?_isa}
BuildRequires: /usr/bin/automake-1.4
BuildRequires: libpng10-devel%{?_isa} >= 1.0.13
BuildRequires: libtool
@@ -75,6 +75,8 @@ Patch104: gnome-libs-1.4.2-xdg-ope
Patch105: gnome-libs-1.4.2-popthelp-format.patch
Patch106: gnome-libs-1.4.2-norecurse.patch
Patch107: gnome-libs-1.4.2-gnome-config-no-Llibdir.patch
+Patch108: gnome-libs-1.4.2-cleanlibs.patch
+Patch109: gnome-libs-1.4.2-ppc64-config.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -88,14 +90,14 @@ Group: Development/Libraries
License: LGPLv2+ and (LGPLv2+ and BSD with advertising)
Requires: gnome-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: glib-devel%{?_isa}
-Requires: gtk+-devel
-Requires: ORBit-devel
+Requires: gtk+-devel%{?_isa}
+Requires: ORBit-devel%{?_isa}
Requires: imlib-devel%{?_isa}
Requires: esound-devel%{?_isa}
Requires: libSM-devel%{?_isa}
Requires: pkgconfig
-# pkg-config knows to use gnome-config when asked about libgnomeui
+# pkg-config knows to use gnome-config when asked about gnomeui
Provides: pkgconfig(gnomeui) = %{version}
# For ownership of %{_datadir}/aclocal
@@ -156,10 +158,16 @@ cd -
%patch105 -p1 -b .popthelp-format
%patch106 -p1 -b .norecurse
%patch107 -p1 -b .nolibdir
+%patch108 -p1 -b .cleanlibs
+%patch109 -p1 -b .ppc64-config
/usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
%{__mv} -f ChangeLog.utf-8 ChangeLog
+# Hack to remove redundant "-lm" from the output of audiofile-config --libs
+%{__mkdir} pkgconfig
+%{__sed} -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc
+
%build
# db1
@@ -190,9 +198,12 @@ echo 'dbinclude is: %{dbinclude}'
CFLAGS="%{optflags} $(pkg-config --cflags libpng10)"
export CPPFLAGS="$(pkg-config --cflags libpng10)"
+export PKG_CONFIG_PATH=$(pwd)/pkgconfig
%configure --with-kde-datadir=%{_datadir} --enable-prefer-db1 --disable-gtk-doc
%{__perl} -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config
-%{__make} LIBTOOL=/usr/bin/libtool
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+%{__make}
%install
%{__rm} -rf %{buildroot}
@@ -310,6 +321,14 @@ export LD_LIBRARY_PATH=${SAVE_LLP}
%{_libdir}/libgnomeui.so
%changelog
+* Thu Apr 9 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-14
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+ rather than trying to use the system one
+- Additional %%{?_isa} devel package dependencies now available
+- Clean up library linkage, linking libraries with the libs they need and only
+ those libs
+- Fix config.guess and config.sub to support build on ppc64
+
* Thu Mar 5 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-13
- Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in
libglade and possibly other packages built on gnome-libs; an actual .pc file
More information about the fedora-extras-commits
mailing list