[mingw-libglade2: 8/18] Rebuild in order to have a soft dependency on mingw32-gettext
epienbro
epienbro at fedoraproject.org
Wed Mar 7 18:00:20 UTC 2012
commit 1d3e700592f83b501a1b50e833cfbf78acb3f629
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Dec 6 18:13:42 2010 +0100
Rebuild in order to have a soft dependency on mingw32-gettext
- Fixed FTBFS
- Use correct %defattr tag
- Fixed a small rpmlint warning
mingw32-libglade-link-against-libintl.patch | 11 +++++++++++
mingw32-libglade2.spec | 19 +++++++++++++++----
2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/mingw32-libglade-link-against-libintl.patch b/mingw32-libglade-link-against-libintl.patch
new file mode 100644
index 0000000..acfcc77
--- /dev/null
+++ b/mingw32-libglade-link-against-libintl.patch
@@ -0,0 +1,11 @@
+--- glade/Makefile.in.orig 2010-10-13 17:45:44.962969018 +0200
++++ glade/Makefile.in 2010-10-13 17:46:13.134689366 +0200
+@@ -260,7 +260,7 @@
+ glade-gtk.c \
+ glade-private.h
+
+-libglade_2_0_la_LIBADD = $(LIBGLADE_LIBS)
++libglade_2_0_la_LIBADD = $(LIBGLADE_LIBS) -Wl,-lintl
+ libglade_2_0_la_LDFLAGS = -version-info $(LTVERSION) $(export_symbols) -no-undefined
+ EXTRA_DIST = $(gladeinclude_HEADERS) \
+ glade.def
diff --git a/mingw32-libglade2.spec b/mingw32-libglade2.spec
index f72d3d9..85003d9 100644
--- a/mingw32-libglade2.spec
+++ b/mingw32-libglade2.spec
@@ -7,7 +7,7 @@
Name: mingw32-libglade2
Version: 2.6.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Libglade2 library
License: LGPLv2+
@@ -18,6 +18,9 @@ Source0: http://download.gnome.org/sources/libglade/2.6/libglade-%{versio
Patch1: libglade-2.0.1-nowarning.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=510736
Patch2: libglade-secondary.patch
+# libglade2 uses libintl directly instead of with GLib so manually link against libintl
+Patch3: mingw32-libglade-link-against-libintl.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -48,13 +51,15 @@ Requires: %{name} = %{version}-%{release}
Static MinGW Windows Libglade2 library.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary
+%patch3 -p0 -b .intl
+
%build
%{_mingw32_configure} --disable-gtk-doc
@@ -72,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc COPYING
%{_mingw32_bindir}/libglade-2.0-0.dll
%{_mingw32_bindir}/libglade-convert
@@ -85,10 +90,16 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd
%files static
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_mingw32_libdir}/libglade-2.0.a
%changelog
+* Mon Dec 6 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-5
+- Rebuild in order to have a soft dependency on mingw32-gettext
+- Fixed FTBFS
+- Use correct %%defattr tag
+- Fixed a small rpmlint warning
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list