From 5161a2ecc0e834ec3c8db523625f42a7c0329368 Mon Sep 17 00:00:00 2001 From: renmingshuai Date: Mon, 24 May 2021 15:13:53 +0800 Subject: [PATCH 1/2] Compilation optimization --- cups.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cups.spec b/cups.spec index ded5a14..6586186 100644 --- a/cups.spec +++ b/cups.spec @@ -2,7 +2,7 @@ Name: cups Epoch: 1 Version: 2.3.3 -Release: 3 +Release: 4 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ @@ -97,7 +97,7 @@ aclocal -I config-scripts autoconf -I config-scripts %build -export DSOFLAGS="$DSOFLAGS -L../cgi-bin -L../filter -L../ppdc -L../scheduler -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/%{?_vendor}/%{?_vendor}-hardened-ld -Wl,-z,relro,-z,now -fPIE -pie" +export DSOFLAGS="$DSOFLAGS -L../cgi-bin -L../filter -L../ppdc -L../scheduler -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld -Wl,-z,relro,-z,now -fPIE -pie" export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1" # --enable-debug to avoid stripping binaries %configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \ @@ -334,6 +334,12 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Mon May 24 2021 liuyumeng - 2.3.3-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Compilation optimization + * Tue Sep 29 2020 hanhui - 2.3.3-3 - Type:bugfix - ID:NA -- Gitee From 54418e5d840135c8df4172a5966dbca6bf7fb074 Mon Sep 17 00:00:00 2001 From: renmingshuai Date: Mon, 24 May 2021 15:37:07 +0800 Subject: [PATCH 2/2] remove unused ncp backend --- cups.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cups.spec b/cups.spec index 6586186..44d07f8 100644 --- a/cups.spec +++ b/cups.spec @@ -2,7 +2,7 @@ Name: cups Epoch: 1 Version: 2.3.3 -Release: 4 +Release: 5 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ @@ -10,7 +10,6 @@ Source0: https://github.com/apple/cups/archive/v%{version}.tar.gz Source2: cupsprinter.png Source3: cups.logrotate -Source4: ncp.backend Source5: macros.cups Patch1: cups-system-auth.patch @@ -154,7 +153,6 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/pixmaps ${RPM_BUILD_ROOT}%{_sysconfdir}/ ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d install -p -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -p -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/cups -install -p -m 755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_exec_prefix}/lib/cups/backend/ncp install -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d touch ${RPM_BUILD_ROOT}%{_sysconfdir}/cups/{printers,classes,client,subscriptions}.conf @@ -334,6 +332,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Mon May 24 2021 liuyumeng - 2.3.3-5 +- remove unused ncp backend + * Mon May 24 2021 liuyumeng - 2.3.3-4 - Type:bugfix - ID:NA -- Gitee