- up to 2.2.4

diff --git a/cups-enum-all.patch b/cups-enum-all.patch
deleted file mode 100644 (file)
index 0ac3983..0000000
--- a/cups-enum-all.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
---- cups-1.6.2/cups/dest.c.enum-all    2013-06-04 10:58:36.169786250 +0100
-+++ cups-1.6.2/cups/dest.c     2013-06-04 10:59:02.147900811 +0100
-@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
-       break;
- 
-     case AVAHI_BROWSER_REMOVE:
--    case AVAHI_BROWSER_ALL_FOR_NOW:
-     case AVAHI_BROWSER_CACHE_EXHAUSTED:
-         break;
-+
-+    case AVAHI_BROWSER_ALL_FOR_NOW:
-+      avahi_simple_poll_quit(data->simple_poll);
-+        break;
-   }
- }
- 

diff --git a/cups.spec b/cups.spec
index 5420a06f5cafa49b67e168e8fe42be6229f5a8ed..481e0cd866c788679d005cfd772bb527240deca7 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -12,13 +12,13 @@
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       2.2.1
-Release:       2
+Version:       2.2.4
+Release:       1
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       https://github.com/apple/cups/releases/download/v%{version}/%{name}-%{version}-source.tar.gz
-# Source0-md5: a94da2a1e9dbdccb4f3836a38a431931
+# Source0-md5: d26e5a0a574a69fe1d01079b2931fc49
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -55,7 +55,7 @@ Patch108:     cups-filter-debug.patch
 Patch109:      cups-hp-deviceid-oid.patch
 Patch110:      cups-dnssd-deviceid.patch
 Patch111:      cups-ricoh-deviceid-oid.patch
-Patch112:      cups-enum-all.patch
+
 Patch113:      cups-dymo-deviceid.patch
 Patch114:      cups-freebind.patch
 Patch115:      cups-ipp-multifile.patch
@@ -288,7 +288,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch109 -p1
 %patch110 -p1
 %patch111 -p1
-%patch112 -p1
+
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
@@ -611,6 +611,7 @@ fi
 %lang(ja) %{_localedir}/ja/cups_ja.po
 %lang(pt_BR) %{_localedir}/pt_BR/cups_pt_BR.po
 %lang(ru) %{_localedir}/ru/cups_ru.po
+%lang(zh_CN) %{_localedir}/zh_CN/cups_zh_CN.po
 
 %files clients
 %defattr(644,root,root,755)