X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcups-filters.git;a=blobdiff_plain;f=cups-filters.spec;h=4e6e70c55cb7b48b77a8a86e85ef59348a02b9a8;hp=1a5d9e9056c476ee0bf535196b9d2b443aff98a1;hb=HEAD;hpb=dfd052140d915551d2353de4020f0c9c4e29dcf1

diff --git a/cups-filters.spec b/cups-filters.spec
index 1a5d9e9..6e67fb8 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -3,7 +3,7 @@
 %bcond_without	static_libs	# static libraries
 %bcond_without	braille		# Braille embossers support
 %bcond_without	perl		# Perl module
-%bcond_without	php		# PHP extension
+%bcond_with	php		# PHP extension
 
 %if 0%{!?php_name:1}
 %define		php_name	php55
@@ -11,7 +11,7 @@
 Summary:	OpenPrinting CUPS filters and backends
 Summary(pl.UTF-8):	Filtry i backendy CUPS-a z projektu OpenPrinting
 Name:		cups-filters
-Version:	1.22.4
+Version:	1.28.17
 Release:	1
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -21,16 +21,17 @@ Release:	1
 # GPLv3:   filters: bannertopdf
 # GPLv3+:  filters: urftopdf
 # LGPLv2+:   utils: cups-browsed
-# MIT:     filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster
+# MIT:     filters: gstoraster, pdftopdf, pdftoraster
 License:	GPL v2, GPL v2+, GPL v3, GPL v3+, LGPL v2+, MIT
 Group:		Applications/Printing
-Source0:	http://www.openprinting.org/download/cups-filters/%{name}-%{version}.tar.xz
-# Source0-md5:	f169959e8f65e121da4712941d1a2a67
-Patch0:		%{name}-dbus.patch
-Patch1:		%{name}-php.patch
-Patch2:		%{name}-php7.patch
-Patch3:		%{name}-php73.patch
-Patch4:		%{name}-poppler.patch
+#Source0:	https://www.openprinting.org/download/cups-filters/%{name}-%{version}.tar.xz
+Source0:	https://github.com/OpenPrinting/cups-filters/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	74741eb5ba32331676f88be468259d1f
+Patch0:		%{name}-php.patch
+Patch1:		%{name}-php7.patch
+Patch2:		%{name}-php73.patch
+Patch3:		%{name}-1.28.17-c++17.patch
+Patch4:		%{name}-1.28.17-CVE-2023-24805.patch
 URL:		http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
@@ -39,29 +40,31 @@ BuildRequires:	avahi-glib-devel
 BuildRequires:	cups-devel >= 1:1.6.0
 BuildRequires:	dbus-devel
 BuildRequires:	fontconfig-devel >= 2.0.0
+BuildRequires:	fonts-TTF-DejaVu
 BuildRequires:	freetype-devel >= 2
+BuildRequires:	gettext-tools >= 0.18.3
 # /usr/bin/gs, for features detection
 %{?with_php:BuildRequires:	%{php_name}-devel}
 BuildRequires:	ghostscript
-BuildRequires:	ghostscript-ijs-devel
 BuildRequires:	glib2-devel >= 1:2.30.2
 BuildRequires:	lcms2-devel >= 2
+BuildRequires:	libexif-devel
 BuildRequires:	libjpeg-devel
 %{?with_braille:BuildRequires:	liblouis-devel}
 BuildRequires:	libpng-devel
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 BuildRequires:	openldap-devel
 %{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig >= 1:0.20
-# just for cpp/poppler-version.h
 BuildRequires:	poppler-cpp-devel >= 0.19
-BuildRequires:	poppler-devel >= 0.19
 # /usr/bin/pdftops, for features detection
 BuildRequires:	poppler-progs >= 0.19
 BuildRequires:	qpdf-devel >= 8.3.0
 BuildRequires:	rpmbuild(macros) >= 1.671
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	zlib-devel
 # DejaVuSans.ttf (testing font for test scripts)
 #BuildRequires:	fonts-TTF-DejaVu
@@ -255,6 +258,7 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %patch4 -p1
 
 %build
+export CXXFLAGS="%{rpmcxxflags} -std=c++17"
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -262,8 +266,6 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %configure \
 	%{!?with_braille:--disable-braille} \
 	--enable-dbus \
-	--enable-ijs \
-	--enable-opvp \
 	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static} \
 	%{?with_php:--with-php} \
@@ -312,8 +314,6 @@ install -p utils/cups-browsed.service $RPM_BUILD_ROOT%{systemdunitdir}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/cups-filters
-# Not sure what is this good for.
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/ttfread
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -354,13 +354,16 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING NEWS README
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/conf.d/99pdftoopvp.conf
 %attr(755,root,root) %{_bindir}/driverless
+%attr(755,root,root) %{_bindir}/driverless-fax
 %attr(755,root,root) %{_bindir}/foomatic-rip
-%attr(755,root,root) %{_cups_serverbin}/backend/beh
-%attr(755,root,root) %{_cups_serverbin}/backend/cups-brf
-%attr(755,root,root) %{_cups_serverbin}/backend/driverless
+%attr(700,root,root) %{_cups_serverbin}/backend/beh
+%attr(700,root,root) %{_cups_serverbin}/backend/cups-brf
+%attr(700,root,root) %{_cups_serverbin}/backend/driverless
+%attr(700,root,root) %{_cups_serverbin}/backend/driverless-fax
+%attr(700,root,root) %{_cups_serverbin}/backend/implicitclass
 %attr(755,root,root) %{_cups_serverbin}/driver/driverless
+%attr(755,root,root) %{_cups_serverbin}/driver/driverless-fax
 %attr(755,root,root) %{_cups_serverbin}/filter/bannertopdf
 %attr(755,root,root) %{_cups_serverbin}/filter/brftopagedbrf
 %attr(755,root,root) %{_cups_serverbin}/filter/cgmtopdf
@@ -377,8 +380,6 @@ fi
 %attr(755,root,root) %{_cups_serverbin}/filter/imagetoraster
 %attr(755,root,root) %{_cups_serverbin}/filter/mupdftoraster
 %attr(755,root,root) %{_cups_serverbin}/filter/musicxmltobrf
-%attr(755,root,root) %{_cups_serverbin}/filter/pdftoijs
-%attr(755,root,root) %{_cups_serverbin}/filter/pdftoopvp
 %attr(755,root,root) %{_cups_serverbin}/filter/pdftopdf
 %attr(755,root,root) %{_cups_serverbin}/filter/pdftops
 %attr(755,root,root) %{_cups_serverbin}/filter/pdftoraster
@@ -476,16 +477,17 @@ fi
 %{_pkgconfigdir}/libcupsfilters.pc
 %{_pkgconfigdir}/libfontembed.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcupsfilters.a
 %{_libdir}/libfontembed.a
+%endif
 
 %files -n cups-browsed
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cups/cups-browsed.conf
 %attr(755,root,root) %{_sbindir}/cups-browsed
-%attr(755,root,root) %{_cups_serverbin}/backend/implicitclass
 %attr(754,root,root) /etc/rc.d/init.d/cups-browsed
 %{systemdunitdir}/cups-browsed.service
 %{_mandir}/man5/cups-browsed.conf.5*
@@ -493,11 +495,11 @@ fi
 
 %files -n cups-backend-parallel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_cups_serverbin}/backend/parallel
+%attr(700,root,root) %{_cups_serverbin}/backend/parallel
 
 %files -n cups-backend-serial
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_cups_serverbin}/backend/serial
+%attr(700,root,root) %{_cups_serverbin}/backend/serial
 
 %if %{with perl}
 %files -n perl-cups