summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2017-09-20 17:20:28 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2017-09-20 17:20:28 +0900
commitadef3287afc72bf67080eaa03ffd78e887c99fa3 (patch)
tree4ace7b8bd2478908737079213e7643f50769b07a
parent7aa3a253a63f196568782c73dffd23051d1953ba (diff)
downloadcups-adef3287afc72bf67080eaa03ffd78e887c99fa3.tar.gz
cups-adef3287afc72bf67080eaa03ffd78e887c99fa3.tar.bz2
cups-adef3287afc72bf67080eaa03ffd78e887c99fa3.zip
[Model] All [BinType] AP [Customer] OPEN [Issue#] N/A [Request] N/A [Occurrence Version] N/A [Problem] version upgrade [Cause & Measure] version upgrade [Checking Method] N/A [Team] Open Source Management and Setting Part [Developer] dh0128.kwak [Solution company] Samsung [Change Type] N/A Change-Id: I1a8dba385e487d4421d4e2e1b26ac4290ac88c9f Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r--packaging/cups.spec64
1 files changed, 42 insertions, 22 deletions
diff --git a/packaging/cups.spec b/packaging/cups.spec
index 58e01f7..1fb43c8 100644
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -1,11 +1,9 @@
#
-# "$Id$"
-#
# RPM "spec" file for CUPS.
#
# Original version by Jason McMullan <jmcc@ontv.com>.
#
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
# Copyright 1999-2007 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
@@ -29,8 +27,8 @@
%define _without_dnssd 1
%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}}
-%{?_with_dnssd: %define _dnssd --enable-dnssd}
-%{!?_with_dnssd: %define _dnssd --disable-dnssd}
+%{?_with_dnssd: %define _dnssd --enable-avahi}
+%{!?_with_dnssd: %define _dnssd --disable-avahi}
%{!?_with_libusb1: %{!?_without_libusb1: %define _with_libusb1 --with-libusb1}}
%{?_with_libusb1: %define _libusb1 --enable-libusb}
@@ -46,15 +44,15 @@
Summary: CUPS
Name: cups
-Version: 2.2.1
+Version: 2.2.4
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
+Source: https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz
Url: http://www.cups.org
-Packager: Anonymous <anonymous@foo.com>
-Vendor: Apple Inc.
+Packager: Anonymous <anonymous@example.com>
+Vendor: Example Corp
Source101: cups.manifest
Source1001: %{name}-rpmlintrc
@@ -128,38 +126,63 @@ make
# Make sure the RPM_BUILD_ROOT directory exists.
rm -rf $RPM_BUILD_ROOT
-make DSTROOT=$RPM_BUILD_ROOT install
+make BUILDROOT=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data
%remove_docs
%post
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+/bin/systemctl enable org.cups.cupsd.service
+
+if test $1 -ge 1; then
+ /bin/systemctl stop org.cups.cupsd.service
+ /bin/systemctl start org.cups.cupsd.service
+fi
+
+%else
/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
+ /sbin/service cups stop
+ /sbin/service cups start
fi
+%endif
%post libs
/sbin/ldconfig
%preun
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+if test $1 -ge 1; then
+ /bin/systemctl stop org.cups.cupsd.service
+ /bin/systemctl disable org.cups.cupsd.service
+fi
+
+%else
if test $1 = 0; then
- /sbin/service cups stop
- /sbin/chkconfig --del cups
+ /sbin/service cups stop
+ /sbin/chkconfig --del cups
fi
+%endif
%postun
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
if test $1 -ge 1; then
- /sbin/service cups stop
- /sbin/service cups start
+ /bin/systemctl stop org.cups.cupsd.service
+ /bin/systemctl start org.cups.cupsd.service
fi
+%else
+if test $1 -ge 1; then
+ /sbin/service cups stop
+ /sbin/service cups start
+fi
+%endif
-%postun libs
+%postun libs
/sbin/ldconfig
%clean
@@ -308,6 +331,8 @@ rm -rf $RPM_BUILD_ROOT
/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/locale/zh_CN
+/usr/share/locale/zh_CN/cups_zh_CN.po
#%dir /usr/share/man/man1
#/usr/share/man/man1/cancel.1.gz
@@ -413,8 +438,3 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/cups/daemon/cups-lpd
#%dir /usr/share/man/man8
#/usr/share/man/man8/cups-lpd.8.gz
-
-
-#
-# End of "$Id$".
-#