From 402e8ab66285e83b820b2bd25e68f091cadfe40b Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Sep 2020 22:37:57 -0700 Subject: [PATCH] Bump to cups 2.3.3 Change-Id: I19eba2301c79dba9639f4dd3d236b90722528da3 Signed-off-by: DongHun Kwak --- packaging/baselibs.conf | 1 + packaging/cups.manifest | 5 ++ packaging/cups.spec | 201 +++++++++++++++++++++++++----------------------- 3 files changed, 111 insertions(+), 96 deletions(-) create mode 100644 packaging/baselibs.conf create mode 100644 packaging/cups.manifest diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 0000000..dd97a16 --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1 @@ +cups-libs diff --git a/packaging/cups.manifest b/packaging/cups.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/cups.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/cups.spec b/packaging/cups.spec index 82d803e..8b39674 100644 --- a/packaging/cups.spec +++ b/packaging/cups.spec @@ -22,6 +22,7 @@ %{?_with_dbus: %define _dbus --enable-dbus} %{!?_with_dbus: %define _dbus --disable-dbus} +%define _without_dnssd 1 %{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}} %{?_with_dnssd: %define _dnssd --enable-avahi} %{!?_with_dnssd: %define _dnssd --disable-avahi} @@ -50,6 +51,8 @@ Url: http://www.cups.org Packager: Anonymous Vendor: Example Corp +Source101: cups.manifest + # Package names are as defined for Red Hat (and clone) distributions BuildRequires: gnutls-devel, pam-devel @@ -69,9 +72,6 @@ BuildRequires: libusb-devel >= 1.0 BuildRequires: systemd-devel %endif -# Use buildroot so as not to disturb the version already installed -BuildRoot: /tmp/%{name}-root - # Dependencies... Requires: %{name}-libs = %{epoch}:%{version} Obsoletes: lpd, lpr, LPRng @@ -110,6 +110,7 @@ This package provides LPD client support. %prep %setup +cp %{SOURCE101} . %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ @@ -122,7 +123,10 @@ make rm -rf $RPM_BUILD_ROOT make BUILDROOT=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data +rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners +rm -rf $RPM_BUILD_ROOT/usr/share/cups/data +rm -rf $RPM_BUILD_ROOT/usr/share/doc/cups +rm -rf $RPM_BUILD_ROOT/usr/share/man %post %if %{?_with_systemd:1}%{!?_with_systemd:0} @@ -182,8 +186,10 @@ fi rm -rf $RPM_BUILD_ROOT %files -%docdir /usr/share/doc/cups +#%docdir /usr/share/doc/cups %defattr(-,root,root) +%license LICENSE +%manifest %{name}.manifest %dir /etc/cups %config(noreplace) /etc/cups/*.conf /etc/cups/cups-files.conf.default @@ -223,7 +229,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/cups/backend %if %{?_with_dnssd:1}%{!?_with_dnssd:0} # DNS-SD -/usr/bin/ippfind +#/usr/bin/ippfind /usr/lib/cups/backend/dnssd %endif /usr/lib/cups/backend/http @@ -269,45 +275,45 @@ rm -rf $RPM_BUILD_ROOT /usr/share/cups/usb/* %endif -%dir /usr/share/doc/cups -/usr/share/doc/cups/*.* -%dir /usr/share/doc/cups/help -/usr/share/doc/cups/help/accounting.html -/usr/share/doc/cups/help/admin.html -/usr/share/doc/cups/help/cgi.html -/usr/share/doc/cups/help/encryption.html -/usr/share/doc/cups/help/firewalls.html -/usr/share/doc/cups/help/glossary.html -/usr/share/doc/cups/help/kerberos.html -/usr/share/doc/cups/help/license.html -/usr/share/doc/cups/help/man-*.html -/usr/share/doc/cups/help/network.html -/usr/share/doc/cups/help/options.html -/usr/share/doc/cups/help/overview.html -/usr/share/doc/cups/help/policies.html -/usr/share/doc/cups/help/ref-*.html -/usr/share/doc/cups/help/security.html -/usr/share/doc/cups/help/sharing.html -/usr/share/doc/cups/help/translation.html -%dir /usr/share/doc/cups/images -/usr/share/doc/cups/images/* +#%dir /usr/share/doc/cups +#/usr/share/doc/cups/*.* +#%dir /usr/share/doc/cups/help +#/usr/share/doc/cups/help/accounting.html +#/usr/share/doc/cups/help/admin.html +#/usr/share/doc/cups/help/cgi.html +#/usr/share/doc/cups/help/encryption.html +#/usr/share/doc/cups/help/firewalls.html +#/usr/share/doc/cups/help/glossary.html +#/usr/share/doc/cups/help/kerberos.html +#/usr/share/doc/cups/help/license.html +#/usr/share/doc/cups/help/man-*.html +#/usr/share/doc/cups/help/network.html +#/usr/share/doc/cups/help/options.html +#/usr/share/doc/cups/help/overview.html +#/usr/share/doc/cups/help/policies.html +#/usr/share/doc/cups/help/ref-*.html +#/usr/share/doc/cups/help/security.html +#/usr/share/doc/cups/help/sharing.html +#/usr/share/doc/cups/help/translation.html +#%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 #/usr/share/doc/cups/cs/* -%dir /usr/share/doc/cups/de -/usr/share/doc/cups/de/* -%dir /usr/share/doc/cups/es -/usr/share/doc/cups/es/* +#%dir /usr/share/doc/cups/de +#/usr/share/doc/cups/de/* +#%dir /usr/share/doc/cups/es +#/usr/share/doc/cups/es/* #%dir /usr/share/doc/cups/fr #/usr/share/doc/cups/fr/* -%dir /usr/share/doc/cups/ja -/usr/share/doc/cups/ja/* -%dir /usr/share/doc/cups/pt_BR -/usr/share/doc/cups/pt_BR/* -%dir /usr/share/doc/cups/ru -/usr/share/doc/cups/ru/* +#%dir /usr/share/doc/cups/ja +#/usr/share/doc/cups/ja/* +#%dir /usr/share/doc/cups/pt_BR +#/usr/share/doc/cups/pt_BR/* +#%dir /usr/share/doc/cups/ru +#/usr/share/doc/cups/ru/* %dir /usr/share/locale/ca /usr/share/locale/ca/cups_ca.po @@ -332,47 +338,47 @@ rm -rf $RPM_BUILD_ROOT %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 -/usr/share/man/man1/cups.1.gz -/usr/share/man/man1/cupstestppd.1.gz -/usr/share/man/man1/ippeveprinter.1.gz -%if %{?_with_dnssd:1}%{!?_with_dnssd:0} -# DNS-SD -/usr/share/man/man1/ippfind.1.gz -%endif -/usr/share/man/man1/ipptool.1.gz -/usr/share/man/man1/lp.1.gz -/usr/share/man/man1/lpoptions.1.gz -/usr/share/man/man1/lpq.1.gz -/usr/share/man/man1/lpr.1.gz -/usr/share/man/man1/lprm.1.gz -/usr/share/man/man1/lpstat.1.gz -%dir /usr/share/man/man5 -/usr/share/man/man5/*.conf.5.gz -/usr/share/man/man5/cupsd-logs.5.gz -/usr/share/man/man5/ipptoolfile.5.gz -/usr/share/man/man5/mime.*.5.gz -%dir /usr/share/man/man7 -/usr/share/man/man7/ippevepcl.7.gz -/usr/share/man/man7/ippeveps.7.gz -%dir /usr/share/man/man8 -/usr/share/man/man8/cups-deviced.8.gz -/usr/share/man/man8/cups-driverd.8.gz -/usr/share/man/man8/cups-exec.8.gz -/usr/share/man/man8/cups-snmp.8.gz -/usr/share/man/man8/cupsaccept.8.gz -/usr/share/man/man8/cupsctl.8.gz -/usr/share/man/man8/cupsfilter.8.gz -/usr/share/man/man8/cupsd.8.gz -/usr/share/man/man8/cupsd-helper.8.gz -/usr/share/man/man8/cupsdisable.8.gz -/usr/share/man/man8/cupsenable.8.gz -/usr/share/man/man8/cupsreject.8.gz -/usr/share/man/man8/lpadmin.8.gz -/usr/share/man/man8/lpc.8.gz -/usr/share/man/man8/lpinfo.8.gz -/usr/share/man/man8/lpmove.8.gz +#%dir /usr/share/man/man1 +#/usr/share/man/man1/cancel.1.gz +#/usr/share/man/man1/cups.1.gz +#/usr/share/man/man1/cupstestppd.1.gz +#/usr/share/man/man1/ippeveprinter.1.gz +#%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +## DNS-SD +#/usr/share/man/man1/ippfind.1.gz +#%endif +#/usr/share/man/man1/ipptool.1.gz +#/usr/share/man/man1/lp.1.gz +#/usr/share/man/man1/lpoptions.1.gz +#/usr/share/man/man1/lpq.1.gz +#/usr/share/man/man1/lpr.1.gz +#/usr/share/man/man1/lprm.1.gz +#/usr/share/man/man1/lpstat.1.gz +#%dir /usr/share/man/man5 +#/usr/share/man/man5/*.conf.5.gz +#/usr/share/man/man5/cupsd-logs.5.gz +#/usr/share/man/man5/ipptoolfile.5.gz +#/usr/share/man/man5/mime.*.5.gz +#%dir /usr/share/man/man7 +#/usr/share/man/man7/ippevepcl.7.gz +#/usr/share/man/man7/ippeveps.7.gz +#%dir /usr/share/man/man8 +#/usr/share/man/man8/cups-deviced.8.gz +#/usr/share/man/man8/cups-driverd.8.gz +#/usr/share/man/man8/cups-exec.8.gz +#/usr/share/man/man8/cups-snmp.8.gz +#/usr/share/man/man8/cupsaccept.8.gz +#/usr/share/man/man8/cupsctl.8.gz +#/usr/share/man/man8/cupsfilter.8.gz +#/usr/share/man/man8/cupsd.8.gz +#/usr/share/man/man8/cupsd-helper.8.gz +#/usr/share/man/man8/cupsdisable.8.gz +#/usr/share/man/man8/cupsenable.8.gz +#/usr/share/man/man8/cupsreject.8.gz +#/usr/share/man/man8/lpadmin.8.gz +#/usr/share/man/man8/lpc.8.gz +#/usr/share/man/man8/lpinfo.8.gz +#/usr/share/man/man8/lpmove.8.gz %dir /var/cache/cups %attr(0775,root,sys) %dir /var/cache/cups/rss @@ -387,17 +393,18 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icons/* %files devel +%manifest %{name}.manifest %defattr(-,root,root) %dir /usr/share/cups/examples /usr/share/cups/examples/* -%dir /usr/share/man/man1 -/usr/share/man/man1/cups-config.1.gz -/usr/share/man/man1/ppd*.1.gz -%dir /usr/share/man/man5 -/usr/share/man/man5/ppdcfile.5.gz -/usr/share/man/man7/backend.7.gz -/usr/share/man/man7/filter.7.gz -/usr/share/man/man7/notifier.7.gz +#%dir /usr/share/man/man1 +#/usr/share/man/man1/cups-config.1.gz +#/usr/share/man/man1/ppd*.1.gz +#%dir /usr/share/man/man5 +#/usr/share/man/man5/ppdcfile.5.gz +#/usr/share/man/man7/backend.7.gz +#/usr/share/man/man7/filter.7.gz +#/usr/share/man/man7/notifier.7.gz /usr/bin/cups-config /usr/bin/ppd* @@ -409,20 +416,22 @@ rm -rf $RPM_BUILD_ROOT /usr/lib*/*.a %endif -%dir /usr/share/doc/cups/help -/usr/share/doc/cups/help/api*.html -/usr/share/doc/cups/help/cupspm.* -/usr/share/doc/cups/help/postscript-driver.html -/usr/share/doc/cups/help/ppd-compiler.html -/usr/share/doc/cups/help/raster-driver.html -/usr/share/doc/cups/help/spec*.html +#%dir /usr/share/doc/cups/help +#/usr/share/doc/cups/help/api*.html +#/usr/share/doc/cups/help/cupspm.* +#/usr/share/doc/cups/help/postscript-driver.html +#/usr/share/doc/cups/help/ppd-compiler.html +#/usr/share/doc/cups/help/raster-driver.html +#/usr/share/doc/cups/help/spec*.html %files libs %defattr(-,root,root) +%manifest %{name}.manifest /usr/lib*/*.so.* %files lpd %defattr(-,root,root) +%manifest %{name}.manifest %if %{?_with_systemd:1}%{!?_with_systemd:0} # SystemD /usr/lib/systemd/system/org.cups.cups-lpd* @@ -434,5 +443,5 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/cups %dir /usr/lib/cups/daemon /usr/lib/cups/daemon/cups-lpd -%dir /usr/share/man/man8 -/usr/share/man/man8/cups-lpd.8.gz +#%dir /usr/share/man/man8 +#/usr/share/man/man8/cups-lpd.8.gz -- 2.7.4