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

diff --git a/cups-filters.spec b/cups-filters.spec
index db437d8..6e67fb8 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -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.28.2
+Version:	1.28.17
 Release:	1
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -24,12 +24,14 @@ Release:	1
 # 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:	32d0209ca2f7168175038ce41f7fe2d1
-Patch0:		%{name}-dbus.patch
-Patch1:		%{name}-php.patch
-Patch2:		%{name}-php7.patch
-Patch3:		%{name}-php73.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
@@ -38,27 +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:	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}
-%{?with_php:BuildRequires:	%{php_name}-devel}
 BuildRequires:	pkgconfig >= 1:0.20
 BuildRequires:	poppler-cpp-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
@@ -249,8 +255,10 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
+export CXXFLAGS="%{rpmcxxflags} -std=c++17"
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -306,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
@@ -471,10 +477,12 @@ 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)