[cups/f15: 4/4] Merge branch 'f14' into f15

[Tim Waugh]

commit 24f7bb4948d3e74e163677351de169f863c91f1a
Merge: 99d2fe0 68e0ea8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jun 29 10:18:44 2011 +0100

    Merge branch 'f14' into f15

 cups.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index 55c280e,96f3411..8bc3241
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.7
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -426,13 -384,12 +426,19 @@@ __EOF_
  install -m644 %{SOURCE3} \
  	%{buildroot}/lib/udev/rules.d/70-cups-libusb.rules
  
 +# install /etc/tmpfiles.d/cups.conf (bug #656566)
 +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d
 +cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/cups.conf <<EOF
 +d %{_localstatedir}/run/cups 0755 root lp -
 +d %{_localstatedir}/run/cups/certs 0511 lp sys -
 +EOF
 +
+ find %{buildroot} -type f -o -type l | sed '
+ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3:
+ /^%lang(C)/d
+ /^\([^%].*\)/d
+ ' > %{name}.lang
+ 
  %post
  /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
  /sbin/chkconfig --add cups || true
@@@ -490,13 -447,9 +496,13 @@@ rm -f %{cups_serverbin}/backend/sm
  %clean
  rm -rf $RPM_BUILD_ROOT
  
- %files
+ %files -f %{name}.lang
  %defattr(-,root,root)
  %doc README.txt CREDITS.txt CHANGES.txt
 +%attr(0660,root,lp) %dev(char,6,0) /lib/udev/devices/lp0
 +%attr(0660,root,lp) %dev(char,6,1) /lib/udev/devices/lp1
 +%attr(0660,root,lp) %dev(char,6,2) /lib/udev/devices/lp2
 +%attr(0660,root,lp) %dev(char,6,3) /lib/udev/devices/lp3
  /lib/udev/rules.d/70-cups-libusb.rules
  %dir %attr(0755,root,lp) %{_sysconfdir}/cups
  %dir %attr(0755,root,lp) /var/run/cups
@@@ -618,9 -565,9 +624,12 @@@
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-2
++* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-3
+ - Tag localization files correctly (bug #716421).
+ 
 +* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-2
 +- Updated avahi patches.
 +
  * Tue Jun 28 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-1
  - 1.4.7.