Merge branch 'f21'

gutenprint.spec

@@ -3,7 +3,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
 # Post-install script to update foomatic PPDs.
@@ -174,7 +174,11 @@ rm -f %{buildroot}%{_datadir}/foomatic/kitload.log
 rm -rf %{buildroot}%{_libdir}/gutenprint/5.2/modules/*.la
 rm -f %{buildroot}%{_sysconfdir}/cups/command.types
 
+%find_lang %{name}
+sed 's!%{_datadir}/locale/\([^/]*\)/LC_MESSAGES/gutenprint.mo!%{_datadir}/locale/\1/gutenprint_\1.po!g' %{name}.lang >%{name}-po.lang
+rm -f %{name}.lang
 %find_lang %{name} --all-name
+cat %{name}-po.lang >>%{name}.lang
 
 %if %{build_with_ijs_support}
 echo .so man1/ijsgutenprint.1 > %{buildroot}%{_mandir}/man1/ijsgutenprint.5.2.1
@@ -222,9 +226,6 @@ exit 0
 %{_datadir}/gutenprint
 %{_libdir}/gutenprint/
 
-# For some reason the po files are needed as well.
-%{_datadir}/locale/*/gutenprint_*.po
-
 %files doc
 %doc COPYING AUTHORS NEWS README doc/FAQ.html doc/gutenprint-users-manual.odt doc/gutenprint-users-manual.pdf
 
@@ -281,6 +282,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Dec  8 2014 Tim Waugh <twaugh@redhat.com> - 5.2.10-9
+- Fix tagging of language-specific files (bug #1157347).
+
 * Fri Aug 29 2014 Tim Waugh <twaugh@redhat.com> - 5.2.10-8
 - More Python 3 fixes for scripts (bug #1134092).