From ca436ec8674aeed6088a1a8e5d5700ccf0395c8f Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mar 29 2012 09:36:58 +0000 Subject: Reverted private-shared-object-provides change (see bug #807767 comment #3). --- diff --git a/cups.spec b/cups.spec index 1c8b658..da70d0d 100644 --- a/cups.spec +++ b/cups.spec @@ -1,12 +1,5 @@ %global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -# Fix private-shared-object-provides -# RPM 4.8 -%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} -%{?filter_setup} -# RPM 4.9 -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ - %global use_alternatives 1 %global lspp 1 @@ -19,7 +12,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.5.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -666,6 +659,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ipptool.1.gz %changelog +* Thu Mar 29 2012 Tim Waugh 1:1.5.2-9 +- Reverted this change (see bug #807767 comment #3): + * Wed Jan 18 2012 Remi Collet + - add filter to fix private-shared-object-provides + * Wed Mar 28 2012 Tim Waugh 1:1.5.2-8 - Avoid systemd PrivateTmp bug by explicitly requiring the fixed version of systemd (bug #807672).