[libldm] Add gtk-doc to fix FTBFS, Add patch for deprecated g_type_init

Peter Robinson pbrobinson at fedoraproject.org
Sun Aug 4 11:12:53 UTC 2013


commit 05160ab7b6a83f54f9d467f4db58e5c507bce6c8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Aug 4 12:12:35 2013 +0100

    Add gtk-doc to fix FTBFS, Add patch for deprecated g_type_init

 libldm-gtype.patch |   12 ++++++++++++
 libldm.spec        |   13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/libldm-gtype.patch b/libldm-gtype.patch
new file mode 100644
index 0000000..a378d26
--- /dev/null
+++ b/libldm-gtype.patch
@@ -0,0 +1,12 @@
+--- libldm-0.2.3/src/ldmtool.c.orig	2013-08-04 11:41:00.357706797 +0100
++++ libldm-0.2.3/src/ldmtool.c	2013-08-04 11:41:58.605069312 +0100
+@@ -777,7 +777,9 @@
+     }
+     g_option_context_free(context);
+ 
++#if (GLIB_MAJOR_VERSION <= 2 && GLIB_MINOR_VERSION <= 35 && GLIB_MICRO_VERSION <= 0)
+     g_type_init();
++#endif
+ 
+     LDM * const ldm = ldm_new(&err);
+ 
diff --git a/libldm.spec b/libldm.spec
index 272e555..88f097c 100644
--- a/libldm.spec
+++ b/libldm.spec
@@ -1,17 +1,19 @@
 Name:           libldm
 Version:        0.2.3
-Release:        3%{?dist}%{?extra_release}
+Release:        4%{?dist}%{?extra_release}
 Summary:        A tool to manage Windows dynamic disks
 
 License:        LGPLv3+ and GPLv3+
 URL:            https://github.com/mdbooth/libldm 
 Source0:        %{url}/downloads/%{name}-%{version}.tar.gz
 Patch0:         cast_be64toh.patch
+Patch1:         libldm-gtype.patch
 
 BuildRequires:  glib2-devel >= 2.26.0
 BuildRequires:  json-glib-devel >= 0.14.0
 BuildRequires:  device-mapper-devel >= 1.0
 BuildRequires:  zlib-devel libuuid-devel readline-devel
+BuildRequires:  gtk-doc
 
 
 %description
@@ -35,11 +37,12 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
 %configure --disable-static --enable-gtk-doc
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -67,11 +70,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Sun Aug  4 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.2.3-4
+- Add gtk-doc to fix FTBFS
+- Add patch for deprecated g_type_init
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Mon Sep 21 2012 Matthew Booth <mbooth at redhat.com> - 0.2.3-1
+* Mon Sep 24 2012 Matthew Booth <mbooth at redhat.com> - 0.2.3-1
 - Initial packaging


More information about the scm-commits mailing list