[mingw-glib2: 50/68] Dropped the proxy-libintl pieces
epienbro
epienbro at fedoraproject.org
Tue Mar 6 19:56:03 UTC 2012
commit 04e4ad78a551fef6fa24f08b6f93a7b71628b502
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Apr 27 19:14:51 2011 +0200
Dropped the proxy-libintl pieces
mingw32-glib2.spec | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec
index ede6b5c..33257dc 100644
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.spec
@@ -7,7 +7,7 @@
Name: mingw32-glib2
Version: 2.28.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@@ -62,10 +62,6 @@ Static version of the MinGW Windows GLib2 library.
%build
-# Make sure that libtool doesn't complain that it can't find
-# the 'real file for library -lintl'
-export lt_cv_deplibs_check_method="pass_all"
-
# GLib can't build static and shared libraries in one go, so we
# build GLib twice here
mkdir build_static
@@ -139,16 +135,6 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
# Bash-completion files aren't interesting for mingw32
rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d
-# The libtool files refer to libintl while they shouldn't
-# Drop this reference manually
-find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \;
-
-# Let binaries depending on GLib link against libproxy-intl in a way that libtool doesn't refuse
-sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la
-
-# Make the pkgconfig LDFLAGS libtool-friendly (as libintl it's a soft dependency now)
-sed -i s/"-lintl"/"-Wl,-lintl"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
-
%find_lang glib20
@@ -214,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.28.6-2
+- Dropped the proxy-libintl pieces
+
* Sat Apr 23 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.28.6-1
- Update to 2.28.6
- Dropped the ugly build hack as it isn't needed anymore (the
More information about the scm-commits
mailing list