Bump to cups 2.2.1

[Model]
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Bump to cups 2.2.1
[Cause & Measure] Bump to cups 2.2.1
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: Id3aab43b655c542ba5b4d9b0c9dbfa196cd791d2
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/packaging/cups.spec b/packaging/cups.spec
index 136ec19..58e01f7 100644 (file)
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec.in 12857 2015-08-31 15:00:45Z msweet $"
+# "$Id$"
 #
 # RPM "spec" file for CUPS.
 #
 # Original version by Jason McMullan <jmcc@ontv.com>.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2016 by Apple Inc.
 # Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -44,17 +44,17 @@
 %{?_with_systemd: %define _systemd --enable-systemd}
 %{!?_with_systemd: %define _systemd --disable-systemd}
 
-Summary:  CUPS
-Name:     cups
-Version:  2.1.2
-Release:  1
-Epoch:    1
-License:  GPL-2.0+ and LGPL-2.1+
-Group:    System/Utilities
-Source:   http://www.cups.org/software/2.1.2/cups-2.1.2-source.tar.bz2
-Url:      http://www.cups.org
+Summary: CUPS
+Name: cups
+Version: 2.2.1
+Release: 0
+Epoch: 1
+License: GPL
+Group: System Environment/Daemons
+Source: https://github.com/apple/cups/releases/download/release-2.2.1/cups-2.2.1-source.tar.gz
+Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
-Vendor:   Apple Inc.
+Vendor: Apple Inc.
 
 Source101:  cups.manifest
 Source1001: %{name}-rpmlintrc
@@ -66,23 +66,17 @@ BuildRequires: gnutls-devel, pam-devel
 BuildRequires: dbus-devel
 %endif
 
-%description
-The Common UNIX Printing System (CUPS) is the
-standards-based, open source printing system.
-
-See http://www.cups.org
-
-
-%package libs
-Summary:        Libraries for CUPS
-License:        GPL-2.0+ ; LGPL-2.1+
-Group:          Hardware/Printing
-
-%description libs
-The Common UNIX Printing System (CUPS) is the
-standards-based, open source printing system.
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+BuildRequires: avahi-devel
+%endif
 
+%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
+BuildRequires: libusb-devel >= 1.0
+%endif
 
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+BuildRequires: systemd-devel
+%endif
 
 # Dependencies...
 Requires: %{name}-libs = %{epoch}:%{version}
@@ -94,77 +88,31 @@ Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh
 
 %package devel
 Summary: CUPS - development environment
+Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}
 
 %package libs
 Summary: CUPS - shared libraries
+Group: System Environment/Libraries
 Provides: libcups1
 
 %package lpd
 Summary: CUPS - LPD support
+Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version} xinetd
 
-%description client
-The Common UNIX Printing System (CUPS) is the
-standards-based, open source printing system.
-
-See http://www.cups.org
-
-This package contains all programs needed
-for running a CUPS client, not a server.
-
-
-%package devel
-Summary:        Development Environment for CUPS
-License:        GPL-2.0+
-Group:          Development/Libraries/C and C++
-# Do not require the exact matching version-release of cups-libs
-# but only a cups-libs package with matching version because
-# for building third-party software which uses only the CUPS public API
-# there are no CUPS-internal dependencies via CUPS private API calls
-# (the latter would require the exact matching cups-libs version-release):
-Requires:       cups-libs = %{version}
-Requires:       libjpeg-devel
-Requires:       libpng-devel
-Requires:       libtiff-devel
-Requires:       libopenssl-devel
-Requires:       pam-devel
-Requires:       zlib-devel
-Requires:       systemd-devel
-Requires:       glibc-devel
+%description
+CUPS is the standards-based, open source printing system developed by
+Apple Inc. for macOS® and other UNIX®-like operating systems.
 
 %description devel
-The Common UNIX Printing System (CUPS) is the
-standards-based, open source printing system.
+This package provides the CUPS headers and development environment.
 
-See http://www.cups.org
-
-This is the development package.
-
-
-%package ddk
-Summary:        CUPS Driver Development Kit
-License:        GPL-2.0+
-Group:          Hardware/Printing
-Requires:       cups = %{version}
-Requires:       cups-devel = %{version}
-# Since CUPS 1.4 the CUPS Driver Development Kit (DDK) is bundled with CUPS.
-# For CUPS 1.2.x and 1.3.x, the DDK was separated software
-# which we provided (up to openSUSE 11.1 / SLE11) in our cupsddk package:
-Provides:       cupsddk = %{version}
-Obsoletes:      cupsddk < %{version}
-
-%description ddk
-The Common UNIX Printing System (CUPS) is the
-standards-based, open source printing system.
-
-See http://www.cups.org
-
-The CUPS Driver Development Kit (DDK) provides
-a suite of standard drivers, a PPD file compiler,
-and other utilities that can be used to develop
-printer drivers for CUPS.
+%description libs
+This package provides the CUPS shared libraries.
 
+%description lpd
+This package provides LPD client support.
 
 %prep
 %setup
@@ -186,17 +134,36 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 %remove_docs
 
 %post
-%systemd_post cups.socket cups.path
+/sbin/chkconfig --add cups
+/sbin/chkconfig cups on
+
+# Restart cupsd if we are upgrading...
+if test $1 -gt 1; then
+    /sbin/service cups stop
+    /sbin/service cups start
+fi
+
+%post libs
+/sbin/ldconfig
 
 %preun
-%systemd_preun cups.socket cups.path
+if test $1 = 0; then
+    /sbin/service cups stop
+    /sbin/chkconfig --del cups
+fi
 
 %postun
-%systemd_postun cups.socket cups.path
+if test $1 -ge 1; then
+    /sbin/service cups stop
+    /sbin/service cups start
+fi
+
 
-%post libs -p /sbin/ldconfig
+%postun libs 
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 #%docdir /usr/share/doc/cups
@@ -208,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 /etc/cups/cups-files.conf.default
 /etc/cups/cupsd.conf.default
 /etc/cups/snmp.conf.default
-%dir /etc/cups/interfaces
 %dir /etc/cups/ppd
 %attr(0700,root,root) %dir /etc/cups/ssl
 
@@ -242,74 +208,49 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 /usr/bin/lp*
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+# DNS-SD
+/usr/lib/cups/backend/dnssd
+%endif
 /usr/lib/cups/backend/http
 /usr/lib/cups/backend/https
-/usr/lib/cups/backend/ipp
+%attr(0700,root,root) /usr/lib/cups/backend/ipp
 /usr/lib/cups/backend/ipps
-/usr/lib/cups/backend/lpd
+%attr(0700,root,root) /usr/lib/cups/backend/lpd
 /usr/lib/cups/backend/snmp
 /usr/lib/cups/backend/socket
 /usr/lib/cups/backend/usb
 %dir /usr/lib/cups/cgi-bin
-/usr/lib/cups/cgi-bin/admin.cgi
-/usr/lib/cups/cgi-bin/classes.cgi
-/usr/lib/cups/cgi-bin/help.cgi
-/usr/lib/cups/cgi-bin/jobs.cgi
-/usr/lib/cups/cgi-bin/printers.cgi
+/usr/lib/cups/cgi-bin/*
 %dir /usr/lib/cups/daemon
 /usr/lib/cups/daemon/cups-deviced
 /usr/lib/cups/daemon/cups-driverd
 /usr/lib/cups/daemon/cups-exec
-/usr/lib/cups/daemon/cups-lpd
 %dir /usr/lib/cups/driver
 %dir /usr/lib/cups/filter
-/usr/lib/cups/filter/commandtops
-/usr/lib/cups/filter/gziptoany
-/usr/lib/cups/filter/pstops
-/usr/lib/cups/filter/rastertodymo
-/usr/lib/cups/filter/rastertoepson
-/usr/lib/cups/filter/rastertohp
-/usr/lib/cups/filter/rastertolabel
-/usr/lib/cups/filter/rastertopwg
+/usr/lib/cups/filter/*
 %dir /usr/lib/cups/monitor
-/usr/lib/cups/monitor/bcp
-/usr/lib/cups/monitor/tbcp
+/usr/lib/cups/monitor/*
 %dir /usr/lib/cups/notifier
-/usr/lib/cups/notifier/dbus
-/usr/lib/cups/notifier/mailto
-/usr/lib/cups/notifier/rss
-%dir %attr(0775,root,ntadmin) %{_datadir}/cups/drivers
-%{_datadir}/applications/cups.desktop
-%{_datadir}/pixmaps/cups.png
-%doc %{_defaultdocdir}/cups
-%doc %{_mandir}/man1/cupstestppd.1.gz
-%doc %{_mandir}/man5/classes.conf.5.gz
-%doc %{_mandir}/man5/client.conf.5.gz
-%doc %{_mandir}/man5/cups-files.conf.5.gz
-%doc %{_mandir}/man5/cups-snmp.conf.5.gz
-%doc %{_mandir}/man5/cupsd.conf.5.gz
-%doc %{_mandir}/man5/mailto.conf.5.gz
-%doc %{_mandir}/man5/mime.convs.5.gz
-%doc %{_mandir}/man5/mime.types.5.gz
-%doc %{_mandir}/man5/printers.conf.5.gz
-%doc %{_mandir}/man5/subscriptions.conf.5.gz
-%doc %{_mandir}/man7/backend.7.gz
-%doc %{_mandir}/man7/filter.7.gz
-%doc %{_mandir}/man7/notifier.7.gz
-%doc %{_mandir}/man8/cups-deviced.8.gz
-%doc %{_mandir}/man8/cups-driverd.8.gz
-%doc %{_mandir}/man8/cups-lpd.8.gz
-%doc %{_mandir}/man8/cups-snmp.8.gz
-%doc %{_mandir}/man8/cupsaddsmb.8.gz
-%doc %{_mandir}/man8/cupsctl.8.gz
-%doc %{_mandir}/man8/cupsd.8.gz
-%doc %{_mandir}/man8/cupsfilter.8.gz
-%{_datadir}/cups/
-%exclude %{_datadir}/cups/ppdc/
-%if 0%{?have_systemd}
-%{_unitdir}/cups.path
-%{_unitdir}/cups.service
-%{_unitdir}/cups.socket
+/usr/lib/cups/notifier/*
+
+/usr/sbin/*
+%dir /usr/share/cups
+%dir /usr/share/cups/drv
+/usr/share/cups/drv/*
+%dir /usr/share/cups/ipptool
+/usr/share/cups/ipptool/*
+%dir /usr/share/cups/mime
+/usr/share/cups/mime/*
+%dir /usr/share/cups/model
+%dir /usr/share/cups/ppdc
+/usr/share/cups/ppdc/*
+%dir /usr/share/cups/templates
+/usr/share/cups/templates/*
+%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
+# LIBUSB quirks files
+%dir /usr/share/cups/usb
+/usr/share/cups/usb/*
 %endif
 
 #%dir /usr/share/doc/cups
@@ -317,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 #%dir /usr/share/doc/cups/help
 #/usr/share/doc/cups/help/accounting.html
 #/usr/share/doc/cups/help/cgi.html
+#/usr/share/doc/cups/help/encryption.html
 #/usr/share/doc/cups/help/glossary.html
 #/usr/share/doc/cups/help/kerberos.html
 #/usr/share/doc/cups/help/license.html
@@ -332,6 +274,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 #%dir /usr/share/doc/cups/images
 #/usr/share/doc/cups/images/*
 
+
 #%dir /usr/share/doc/cups/ca
 #/usr/share/doc/cups/ca/*
 #%dir /usr/share/doc/cups/cs
@@ -363,6 +306,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 /usr/share/locale/ja/cups_ja.po
 %dir /usr/share/locale/ru
 /usr/share/locale/ru/cups_ru.po
+%dir /usr/share/locale/pt_BR
+/usr/share/locale/pt_BR/cups_pt_BR.po
 
 #%dir /usr/share/man/man1
 #/usr/share/man/man1/cancel.1.gz
@@ -452,8 +397,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 %manifest %{name}.manifest
 /usr/lib*/*.so.*
 
-%files libs
-%manifest %{name}.manifest
+%files lpd
 %defattr(-,root,root)
 %manifest %{name}.manifest
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
@@ -472,5 +416,5 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 
 
 #
-# End of "$Id: cups.spec.in 12857 2015-08-31 15:00:45Z msweet $".
+# End of "$Id$".
 #