- up to 1.5rc1; usb patches questionable

Changed files:
    cups-no-polluted-krb5config.patch -> 1.3
    cups.spec -> 1.299

diff --git a/cups-no-polluted-krb5config.patch b/cups-no-polluted-krb5config.patch
index 87206f79232b675d712ba7663ebdf2313c70dc27..d038afa505ee3cbac8bcc92cf527d6e17edd046d 100644 (file)
--- a/cups-no-polluted-krb5config.patch
+++ b/cups-no-polluted-krb5config.patch
@@ -1,16 +1,15 @@
---- cups-1.3.4/config-scripts/cups-gssapi.m4~  2007-08-01 21:02:47.000000000 +0200
-+++ cups-1.3.4/config-scripts/cups-gssapi.m4   2007-12-06 23:18:40.000000000 +0100
-@@ -27,9 +27,9 @@
+--- cups-1.5rc1/config-scripts/cups-gssapi.m4~ 2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5rc1/config-scripts/cups-gssapi.m4  2011-06-15 21:40:54.182690659 +0200
+@@ -46,9 +46,9 @@
                                ;;
                        *)
                                # Other platforms just ask for GSSAPI
--                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
--                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
+-                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"
+-                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"
 -                              LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-+                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"         
-+                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"             
++                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"
++                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"
 +                              LIBGSSAPI="`CFLAGS= LDFLAGS= $KRB5CONFIG --libs gssapi`"
                                ;;
                esac
                AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-       else

diff --git a/cups.spec b/cups.spec
index a70b25b18eae8455192f70e82dd34cf55a90e3fa..6bd236d5e77ef4dabac986a843e5f74e9713ca48 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -16,13 +16,13 @@
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       1.4.6
-Release:       1
+Version:       1.5rc1
+Release:       0.1
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:         Applications/Printing
 Source0:       http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: de8fb5a29c36554925c0c6a6e2c0dae1
+# Source0-md5: f2895d2df9e17aa2c5b05838a56e79a8
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -303,11 +303,13 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+# why it hasn't been merged for so long (and why no other distro uses it)
+#%patch6 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
+# why it hasn't been merged for so long (and why no other distro uses it)
+#%patch11 -p1
 %patch12 -p1
 
 %build
@@ -519,6 +521,7 @@ fi
 %attr(755,root,root) %{_ulibdir}/cups/backend/*
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-driverd
+%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-exec
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-polld
 %attr(755,root,root) %{_ulibdir}/cups/filter/*
 %attr(755,root,root) %{_ulibdir}/cups/monitor/*
@@ -598,7 +601,6 @@ fi
 %attr(755,root,root) %{_libdir}/libcupsmime.so.*
 %attr(755,root,root) %{_libdir}/libcupsppdc.so.*
 %dir %{_datadir}/cups
-%{_datadir}/cups/charmaps
 %lang(da) %{_datadir}/locale/da/cups_da.po
 %lang(de) %{_datadir}/locale/de/cups_de.po
 %lang(es) %{_datadir}/locale/es/cups_es.po
@@ -623,6 +625,7 @@ fi
 %defattr(644,root,root,755)
 %attr(644,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/client.conf
 %attr(755,root,root) %{_bindir}/cancel
+%attr(755,root,root) %{_bindir}/ipptool
 %attr(755,root,root) %{_bindir}/lp
 %attr(755,root,root) %{_bindir}/lpoptions
 %attr(755,root,root) %{_bindir}/lpq
@@ -642,9 +645,11 @@ fi
 %attr(755,root,root) %{_sbindir}/lpinfo
 %attr(755,root,root) %{_sbindir}/lpmove
 %attr(755,root,root) %{_sbindir}/reject
+%{_datadir}/cups/ipptool
 %{_desktopdir}/cups.desktop
 %{_iconsdir}/hicolor/*/apps/cups.png
 %{_mandir}/man1/cancel.1*
+%{_mandir}/man1/ipptool.1*
 %{_mandir}/man1/lp.1*
 %{_mandir}/man1/lpoptions.1*
 %{_mandir}/man1/lpq.1*