diff --git a/cups.spec b/cups.spec index ff9f1aa..475d56c 100644 --- a/cups.spec +++ b/cups.spec @@ -29,7 +29,7 @@ Patch5: cups-ext.patch Patch6: cups-includeifexists.patch Patch7: cups-banners.patch Patch12: cups-locale.patch -Patch17: cups-1.1.19-no_rpath.patch +Patch17: cups-rpath.patch Patch18: cups-language.patch Patch20: cups-direct-usb.patch Patch22: cups-dest-cache-v2.patch @@ -110,7 +110,7 @@ lpd emulation. %patch6 -p1 -b .includeifexists %patch7 -p1 -b .banners %patch12 -p1 -b .locale -%patch17 -p1 -b .no_rpath +%patch17 -p1 -b .rpath %patch18 -p1 -b .language %patch20 -p1 -b .direct-usb %patch22 -p1 -b .dest-cache-v2 @@ -131,7 +131,7 @@ perl -pi -e "s,^.SILENT:,," Makedefs.in export CFLAGS="-DLDAP_DEPRECATED=1" %configure --with-docdir=%{_docdir}/cups-%{version} \ --with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \ - --with-log-file-perm=0700 --enable-pie + --with-log-file-perm=0700 --enable-pie --disable-rpath # If we got this far, all prerequisite libraries must be here. make @@ -376,6 +376,7 @@ rm -rf $RPM_BUILD_ROOT - No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches. - Switch to upstream PIE implementation (every single binary is PIE). - Extend relro to all binaries. +- Better rpath patch. * Wed Apr 26 2006 Tim Waugh - No longer need backend, rcp, or ppdsdat patches.