- up to 2.1.0

diff --git a/cups-direct_usb.patch b/cups-direct_usb.patch
index 3e7bef37b63b468ab1b5f6c16fcb9f7aed2209fc..4e25ce7db4556f8c5322e9b28d50f15f25c76913 100644 (file)
--- a/cups-direct_usb.patch
+++ b/cups-direct_usb.patch
@@ -1,15 +1,17 @@
---- cups-1.2.8/backend/usb-unix.c.direct-usb   2007-02-05 20:25:50.000000000 +0000
-+++ cups-1.2.8/backend/usb-unix.c      2007-02-14 17:44:40.000000000 +0000
-@@ -87,6 +87,8 @@
-              strcasecmp(hostname, "Canon") &&
-              strncasecmp(hostname, "Konica", 6) &&
-              strncasecmp(hostname, "Minolta", 7);
+diff -up cups-1.5b1/backend/usb-unix.c.direct-usb cups-1.5b1/backend/usb-unix.c
+--- cups-1.5b1/backend/usb-unix.c.direct-usb   2011-05-20 05:49:49.000000000 +0200
++++ cups-1.5b1/backend/usb-unix.c      2011-05-23 17:52:14.000000000 +0200
+@@ -102,6 +102,9 @@ print_device(const char *uri,              /* I - De
+              _cups_strncasecmp(hostname, "Minolta", 7);
+ #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
+ 
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
 +      use_bc = 0;
- #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
-  
++
      if ((device_fd = open_device(uri, &use_bc)) == -1)
-@@ -304,12 +306,7 @@
+     {
+       if (getenv("CLASS") != NULL)
+@@ -331,12 +334,7 @@ open_device(const char *uri,              /* I - Dev
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 6d8d60a07c1cbdebb1f64f2e590efdc3e2de0557..03c21b8219da7bd8580bee23f4e2f96d4a20be73 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,15 +1,3 @@
-diff -up cups-2.0.2/cups/usersys.c.ustTJg cups-2.0.2/cups/usersys.c
---- cups-2.0.2/cups/usersys.c.ustTJg   2015-02-10 13:40:24.294545077 +0100
-+++ cups-2.0.2/cups/usersys.c  2015-02-10 13:46:56.763989233 +0100
-@@ -1017,7 +1017,7 @@ cups_finalize_client_conf(
-     struct stat       sockinfo;               /* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--      (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+      (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
 diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
 --- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
 +++ cups-2.0.2/scheduler/main.c        2015-02-10 13:40:24.295545063 +0100

diff --git a/cups.spec b/cups.spec
index da28eb143e68748d5619bdb3f184d69331b8b5a0..2c94378d8f99d2edb606aae8e95e81c1aeaa82cb 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -10,13 +10,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.0.2
-Release:       4
+Version:       2.1.0
+Release:       1
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: 6e0ea72dbafcf5baaa1cf4178e71096d
+# Source0-md5: c4e57a66298bfdba66bb3d5bedd317a4
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -350,10 +350,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
 
-# shipped in cups-filters
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/banners/*
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/data/testprint
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -455,8 +451,10 @@ fi
 %{_ulibdir}/cups/cgi-bin/*.html
 %{_ulibdir}/cups/cgi-bin/*.png
 %{_ulibdir}/cups/cgi-bin/*.txt
+%lang(de) %{_ulibdir}/cups/cgi-bin/de
 %lang(es) %{_ulibdir}/cups/cgi-bin/es
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
+%lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
 %dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
@@ -510,8 +508,10 @@ fi
 
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
+%lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
 %lang(ja) %{_datadir}/cups/templates/ja
+%lang(ru) %{_datadir}/cups/templates/ru
 %{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
@@ -523,6 +523,7 @@ fi
 %{_mandir}/man5/cups-files.conf.5*
 %{_mandir}/man5/cups-snmp.conf.5*
 %{_mandir}/man5/cupsd.conf.5*
+%{_mandir}/man5/cupsd-logs.5*
 %{_mandir}/man5/ipptoolfile.5*
 %{_mandir}/man5/mailto.conf.5*
 %{_mandir}/man5/mime.convs.5*
@@ -537,7 +538,6 @@ fi
 %{_mandir}/man8/cupsctl.8*
 %{_mandir}/man8/cupsd.8*
 %{_mandir}/man8/cupsd-helper.8*
-%{_mandir}/man8/cupsd-logs.8*
 %{_mandir}/man8/cupsfilter.8*
 
 %dir %attr(775,root,lp) /var/cache/cups
@@ -566,6 +566,7 @@ fi
 %dir %{_datadir}/cups
 %lang(ca) %{_datadir}/locale/ca/cups_ca.po
 %lang(cs) %{_datadir}/locale/cs/cups_cs.po
+%lang(de) %{_datadir}/locale/de/cups_de.po
 %lang(es) %{_datadir}/locale/es/cups_es.po
 %lang(fr) %{_datadir}/locale/fr/cups_fr.po
 %lang(it) %{_datadir}/locale/it/cups_it.po