From 306812e9c28e0db0b69bb9dfe6863ed67a0f5985 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 11 Feb 2015 13:35:38 +0100 Subject: [PATCH] Update to 1.4.4 release Tag translations correctly with %find_lang. Re-run intltoolize to regenerate po/Makefile.in.in after autoreconf. The first intltoolize run makes sure that appropriate intltool.m4 is in place before autoreconf. In case autoconf generates configure withouth the new intltool.m4 DATADIRNAME is not substituted into po/Makefile.in and translations are not installed. --- .gitignore | 1 + ModemManager.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 44e5d05..a18af2f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ ModemManager-0.4.git20100720.tar.bz2 /ModemManager-1.3.0.git20140805.3dd6f931.tar.xz /ModemManager-1.4.0.tar.xz /ModemManager-1.4.2.tar.xz +/ModemManager-1.4.4.tar.xz diff --git a/ModemManager.spec b/ModemManager.spec index a459bf7..4854fd0 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -6,7 +6,7 @@ Summary: Mobile broadband modem management service Name: ModemManager -Version: 1.4.2 +Version: 1.4.4 Release: 1%{?dist} # # Source from http://freedesktop.org/software/ModemManager/ @@ -27,7 +27,7 @@ BuildRequires: libgudev1-devel >= 143 BuildRequires: automake autoconf intltool libtool BuildRequires: intltool BuildRequires: libxslt gtk-doc -BuildRequires: libqmi-devel >= 1.10 +BuildRequires: libqmi-devel >= 1.12.4 BuildRequires: libmbim-devel >= 1.10 BuildRequires: gobject-introspection-devel >= 1.38 BuildRequires: vala-tools vala-devel @@ -86,6 +86,7 @@ Vala bindings for ModemManager %build +intltoolize --force autoreconf -i --force intltoolize --force %configure \ @@ -110,6 +111,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la +%find_lang %{name} + %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %systemd_post ModemManager.service @@ -131,7 +134,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig -%files +%files -f %{name}.lang %doc COPYING README %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service @@ -144,7 +147,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{systemd_dir}/ModemManager.service %{_datadir}/icons/hicolor/22x22/apps/*.png %{_mandir}/man8/* -%{_datadir}/locale/*/LC_MESSAGES/ModemManager.mo %files devel %{_includedir}/ModemManager/*.h @@ -169,6 +171,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/vala/vapi/libmm-glib.* %changelog +* Wed Feb 11 2015 Lubomir Rintel - 1.4.4-1 +- Update to 1.4.4 release + * Thu Jan 15 2015 Dan Williams - 1.4.2-1 - Update to 1.4.2 release diff --git a/sources b/sources index 97b344e..9e2abc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe74eaa9a77e51e552b4356b4c7195cb ModemManager-1.4.2.tar.xz +248954c98df0002591506753b8011aa9 ModemManager-1.4.4.tar.xz