[cups/f19] don't ship Russian web templates because they're broken (#960571, STR #4310)

Jiří Popelka jpopelka at fedoraproject.org
Thu May 23 08:34:33 UTC 2013


commit c314542ce0202933bd3c4f255e6d1c16b4fd1cbb
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu May 23 10:29:56 2013 +0200

    don't ship Russian web templates because they're broken (#960571, STR #4310)

 cups.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index f038c2e..c80c79a 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -360,6 +360,10 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3:
 /^\([^%].*\)/d
 ' > %{name}.lang
 
+# don't ship Russian web templates because they're broken (#960571, STR #4310)
+# will be fixed in 1.6.3
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/www/ru
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/cups/templates/ru
 
 %post
 %systemd_post %{name}.path %{name}.socket %{name}.service
@@ -517,7 +521,7 @@ rm -f %{cups_serverbin}/backend/smb
 %dir %{_datadir}/%{name}/www/es
 %dir %{_datadir}/%{name}/www/fr
 %dir %{_datadir}/%{name}/www/ja
-%dir %{_datadir}/%{name}/www/ru
+#%%dir %{_datadir}/%{name}/www/ru
 %{_datadir}/%{name}/www/images
 %{_datadir}/%{name}/www/*.css
 %doc %{_datadir}/%{name}/www/index.html
@@ -528,7 +532,7 @@ rm -f %{cups_serverbin}/backend/smb
 %doc %{_datadir}/%{name}/www/es/index.html
 %doc %{_datadir}/%{name}/www/fr/index.html
 %doc %{_datadir}/%{name}/www/ja/index.html
-%doc %{_datadir}/%{name}/www/ru/index.html
+#%%doc %{_datadir}/%{name}/www/ru/index.html
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}.socket
 %{_unitdir}/%{name}.path
@@ -561,14 +565,14 @@ rm -f %{cups_serverbin}/backend/smb
 %dir %{_datadir}/cups/templates/es
 %dir %{_datadir}/cups/templates/fr
 %dir %{_datadir}/cups/templates/ja
-%dir %{_datadir}/cups/templates/ru
+#%%dir %{_datadir}/cups/templates/ru
 %{_datadir}/cups/templates/*.tmpl
 %{_datadir}/cups/templates/ca/*.tmpl
 %{_datadir}/cups/templates/cs/*.tmpl
 %{_datadir}/cups/templates/es/*.tmpl
 %{_datadir}/cups/templates/fr/*.tmpl
 %{_datadir}/cups/templates/ja/*.tmpl
-%{_datadir}/cups/templates/ru/*.tmpl
+#%%{_datadir}/cups/templates/ru/*.tmpl
 %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
 %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
 %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
@@ -621,6 +625,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-6
+- don't ship Russian web templates because they're broken (#960571, STR #4310)
+
 * Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-5
 - move cups/ppdc/ to filesystem subpackage
 


More information about the scm-commits mailing list