From 9fdda5cf944d86dae29bcfb736f3ebbd8ea3f210 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Feb 2011 08:18:42 -0600 Subject: [PATCH] hack around FTBFS on sparc --- ModemManager-0.4-hack_sparc_werror.patch | 12 ++++++++++++ ModemManager.spec | 13 ++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ModemManager-0.4-hack_sparc_werror.patch diff --git a/ModemManager-0.4-hack_sparc_werror.patch b/ModemManager-0.4-hack_sparc_werror.patch new file mode 100644 index 0000000..edece29 --- /dev/null +++ b/ModemManager-0.4-hack_sparc_werror.patch @@ -0,0 +1,12 @@ +diff -up ModemManager-0.4/src/mm-log.c.format ModemManager-0.4/src/mm-log.c +--- ModemManager-0.4/src/mm-log.c.format 2011-01-24 14:31:25.000000000 -0600 ++++ ModemManager-0.4/src/mm-log.c 2011-02-25 08:03:00.315754971 -0600 +@@ -88,7 +88,7 @@ _mm_log (const char *loc, + usecs += 1000000; + } + +- snprintf (&tsbuf[0], sizeof (tsbuf), " [%06ld.%06ld]", secs, usecs); ++ snprintf (&tsbuf[0], sizeof (tsbuf), " [%06ld.%06ld]", secs, (long) usecs); + } + + if ((log_level & LOGL_DEBUG) && (level == LOGL_DEBUG)) diff --git a/ModemManager.spec b/ModemManager.spec index b86850d..4a4a4cd 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -4,7 +4,7 @@ Summary: Mobile broadband modem management service Name: ModemManager Version: 0.4 -Release: 7%{snapshot}%{?dist} +Release: 7%{snapshot}%{?dist}.1 # # Source from git://anongit.freedesktop.org/ModemManager/ModemManager # tarball built with: @@ -29,6 +29,10 @@ BuildRequires: automake autoconf intltool libtool # for xsltproc BuildRequires: libxslt +# HACK patch to workaround FTBFS on sparc, type mismatch where +# suseconds_t is int -- Rex +Patch1: ModemManager-0.4-hack_sparc_werror.patch + %description The ModemManager service provides a consistent API to operate many different modems, including mobile broadband (3G) devices. @@ -36,6 +40,10 @@ modems, including mobile broadband (3G) devices. %prep %setup -q +%ifarch %{sparc} +%patch1 -p1 -b .hack_sparc_werror.patch +%endif + %build %configure \ @@ -89,6 +97,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/dbus-1/interfaces/*.xml %changelog +* Fri Feb 25 2011 Rex Dieter 0.4-7.git20110201.1 +- hack around FTBFS on sparc + * Mon Feb 07 2011 Fedora Release Engineering - 0.4-7.git20110201 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild