[mingw-atk: 15/27] Rebuild in order to have soft dependency on libintl
epienbro
epienbro at fedoraproject.org
Tue Mar 6 16:30:05 UTC 2012
commit f1b112c8c3b51c8701fe1e66132097abcec18a90
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Nov 7 18:53:43 2010 +0100
Rebuild in order to have soft dependency on libintl
atk-fix-build-against-proxy-libintl.patch | 11 +++++++++++
mingw32-atk.spec | 13 ++++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/atk-fix-build-against-proxy-libintl.patch b/atk-fix-build-against-proxy-libintl.patch
new file mode 100644
index 0000000..0677881
--- /dev/null
+++ b/atk-fix-build-against-proxy-libintl.patch
@@ -0,0 +1,11 @@
+--- configure.orig 2010-10-22 19:45:04.327176866 +0200
++++ configure 2010-10-22 19:45:27.297113917 +0200
+@@ -11919,7 +11919,7 @@
+ fi
+
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS="-lintl $libintl_extra_libs"
++ INTLLIBS="-Wl,-lintl $libintl_extra_libs"
+ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
diff --git a/mingw32-atk.spec b/mingw32-atk.spec
index c698355..a2c87e3 100644
--- a/mingw32-atk.spec
+++ b/mingw32-atk.spec
@@ -7,7 +7,7 @@
Name: mingw32-atk
Version: 1.32.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Atk library
License: LGPLv2+
@@ -16,6 +16,9 @@ URL: http://projects.gnome.org/accessibility/
Source: http://ftp.gnome.org/pub/GNOME/sources/atk/1.32/atk-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix compatibility with proxy-libintl
+Patch0: atk-fix-build-against-proxy-libintl.patch
+
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 49
@@ -51,6 +54,7 @@ Static version of the MinGW Windows Atk library.
%prep
%setup -q -n atk-%{version}
+%patch0 -p0
%build
@@ -73,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc
# See: https://bugzilla.redhat.com/show_bug.cgi?id=467409#c8
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/atk-1.0.def
+# 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'@@ {} \;
+
%find_lang atk10
@@ -95,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 7 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.32.0-2
+- Rebuild in order to have soft dependency on libintl
+
* Mon Oct 11 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.32.0-1
- Update to 1.32.0
- Drop upstreamed patch
More information about the scm-commits
mailing list