Merge branch 'master' into f21

gettext.spec

@@ -6,7 +6,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -91,8 +91,10 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-common-devel = %{version}-%{release}
 Requires(post): info
 Requires(preun): info
+%if %{with git}
 # for autopoint
 Requires: git
+%endif
 Obsoletes: gettext-autopoint < 0.18.1.1-3
 Provides: gettext-autopoint = %{version}-%{release}
 
@@ -334,6 +336,9 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Wed Dec 31 2014 Daiki Ueno <dueno@redhat.com> - 0.19.4-2
+- remove git dependency from -devel subpackage (#1161284)
+
 * Fri Dec 26 2014 Daiki Ueno <dueno@redhat.com> - 0.19.4-1
 - update to 0.19.4 release