diff --git a/cups-str4475.patch b/cups-str4475.patch new file mode 100644 index 0000000..f279ec0 --- /dev/null +++ b/cups-str4475.patch @@ -0,0 +1,24 @@ +diff -up cups-1.7.5/cgi-bin/admin.c.str4475 cups-1.7.5/cgi-bin/admin.c +--- cups-1.7.5/cgi-bin/admin.c.str4475 2014-09-01 13:03:51.295152124 +0100 ++++ cups-1.7.5/cgi-bin/admin.c 2014-09-01 13:03:59.367197078 +0100 +@@ -1917,7 +1917,7 @@ do_config_server(http_t *http) /* I - H + } + else + { +- cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect"); ++ cgiSetVariable("refresh_page", "5;URL=/admin/"); + + cgiStartHTML(cgiText(_("Edit Configuration File"))); + cgiCopyTemplateLang("restart.tmpl"); +diff -up cups-1.7.5/templates/restart.tmpl.str4475 cups-1.7.5/templates/restart.tmpl +--- cups-1.7.5/templates/restart.tmpl.str4475 2008-10-08 23:50:16.000000000 +0100 ++++ cups-1.7.5/templates/restart.tmpl 2014-09-01 13:03:59.368197084 +0100 +@@ -2,7 +2,7 @@ + +
Please stand by while the server restarts...
+ + diff --git a/cups.spec b/cups.spec index 6b95648..cb5f014 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Url: http://www.cups.org/ Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 @@ -68,6 +68,7 @@ Patch38: cups-journal.patch Patch39: cups-synconclose.patch Patch40: cups-str4461.patch Patch41: cups-str2913.patch +Patch42: cups-str4475.patch Patch100: cups-lspp.patch @@ -274,6 +275,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. # Upstream patch for STR #2913 to limit Get-Jobs replies to 500 jobs # (bug #421671). %patch41 -p1 -b .str2913 +# Fix icon display in web interface during server restart (STR #4475). +%patch42 -p1 -b .str4475 %if %lspp # LSPP support. @@ -681,6 +684,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Sep 1 2014 Tim Waugh