[mingw-libglade2: 14/18] Fix compilation against pango 1.29.5 and dropped .la files
epienbro
epienbro at fedoraproject.org
Wed Mar 7 18:00:50 UTC 2012
commit b6e0889b5ac11ae5bfa56ce46e8c2064a282ac2d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Jan 31 23:04:25 2012 +0100
Fix compilation against pango 1.29.5 and dropped .la files
libglade-link-against-gmodule.patch | 12 ++++++++++++
mingw32-libglade2.spec | 14 +++++++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/libglade-link-against-gmodule.patch b/libglade-link-against-gmodule.patch
new file mode 100644
index 0000000..2771448
--- /dev/null
+++ b/libglade-link-against-gmodule.patch
@@ -0,0 +1,12 @@
+--- configure.in.orig 2012-01-31 22:48:44.250167665 +0100
++++ configure.in 2012-01-31 22:49:05.397546359 +0100
+@@ -46,7 +46,8 @@
+ libxml-2.0 >= required_libxml_version dnl
+ atk >= required_atk_version dnl
+ gtk+-2.0 >= required_gtk_version dnl
+- glib-2.0 >= required_glib_version])
++ glib-2.0 >= required_glib_version dnl
++ gmodule-2.0 >= required_glib_version])
+
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in
diff --git a/mingw32-libglade2.spec b/mingw32-libglade2.spec
index 439638e..888417d 100644
--- a/mingw32-libglade2.spec
+++ b/mingw32-libglade2.spec
@@ -15,6 +15,8 @@ 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
+# As of pango 1.29.5 the gmodule library isn't pulled in automatically anymore
+Patch3: libglade-link-against-gmodule.patch
BuildArch: noarch
@@ -30,6 +32,10 @@ BuildRequires: mingw32-libxml2
# Native one for msgfmt
BuildRequires: gettext
+# Needed for patch3
+BuildRequires: gtk2-devel
+BuildRequires: autoconf automake libtool
+
Requires: pkgconfig
%description
@@ -51,7 +57,9 @@ Static MinGW Windows Libglade2 library.
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary
+%patch3 -p0 -b .gmodule
+autoreconf --install --force
%build
%{_mingw32_configure} --disable-gtk-doc
@@ -62,6 +70,9 @@ make %{?_smp_mflags}
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
+
%files
%doc COPYING
@@ -69,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade
%{_mingw32_bindir}/libglade-convert
%{_mingw32_includedir}/libglade-2.0
%{_mingw32_libdir}/libglade-2.0.dll.a
-%{_mingw32_libdir}/libglade-2.0.la
%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc
%dir %{_mingw32_datadir}/xml/libglade
@@ -82,8 +92,10 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade
%changelog
* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-10
- Rebuild against libpng 1.5
+- Fix compilation against pango 1.29.5
- Dropped unneeded RPM tags
- Dropped the dependency extraction overrides as that's done automatically as of RPM 4.9
+- Dropped .la files
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list