Merge branch 'master' into f22

2015-03-29 21:23:36 +02:00 · 2015-03-29 21:23:36 +02:00 · ebd375d161
parent 2af2fd86b3 2c968d5d50
commit ebd375d161
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,3 +32,4 @@ ModemManager-0.4.git20100720.tar.bz2
 /ModemManager-1.4.0.tar.xz
 /ModemManager-1.4.2.tar.xz
 /ModemManager-1.4.4.tar.xz
+/ModemManager-1.4.6.tar.xz
--- a/ModemManager.spec
+++ b/ModemManager.spec
@ -6,8 +6,8 @@

 Summary: Mobile broadband modem management service
 Name: ModemManager
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
 #
 # Source from http://freedesktop.org/software/ModemManager/
 #
@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/vala/vapi/libmm-glib.*

 %changelog
+* Sun Mar 29 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.6-1
+- Update to 1.4.6 release
+
 * Mon Mar  2 2015 Dan Williams <dcbw@redhat.com> - 1.4.4-2
 - Don't print location information in logs (rh #1194492)

--- a/2
+++ b/2
@ -1 +1 @@
-248954c98df0002591506753b8011aa9  ModemManager-1.4.4.tar.xz
+158a5b5206d933121a993fd603a36b2a  ModemManager-1.4.6.tar.xz