From 53b9657b271267b222f9c5201d7c4ec782b17ba6b58d6a5308707b7efdbcfd0c Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Fri, 10 Jan 2014 10:11:34 +0000 Subject: [PATCH] Revert last change that tried to remove the /usr/share/cups/fonts -> ../ghostscript/fonts link see https://bugzilla.novell.com/show_bug.cgi?id=856731#c8 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=272 --- cups.changes | 14 -------------- cups.spec | 12 +----------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/cups.changes b/cups.changes index 94c6830..e18051e 100644 --- a/cups.changes +++ b/cups.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 9 17:32:40 CET 2014 - jsmeix@suse.de - -- If /usr/share/cups/fonts is a symbolic link - (usually /usr/share/cups/fonts -> ../ghostscript/fonts - but it does not matter whereto such a link points) - then remove the link because CUPS' own Monospace fonts - are provided by this package in the /usr/share/cups/fonts/ - directory but RPM cannot replace a symbolic link by a directory - (RPM would complain with "file /usr/share/cups/fonts - from install of cups- conflicts - with file from package cups-") - see https://bugzilla.novell.com/show_bug.cgi?id=856731#c6 - ------------------------------------------------------------------- Wed Jan 8 16:07:44 CET 2014 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index 33ef0a5..5833130 100644 --- a/cups.spec +++ b/cups.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: cups BuildRequires: dbus-1-devel BuildRequires: fdupes @@ -470,17 +471,6 @@ EOF %if 0%{?have_systemd} %service_add_pre cups.service cups.socket cups.path %endif -# If /usr/share/cups/fonts is a symbolic link -# (usually /usr/share/cups/fonts -> ../ghostscript/fonts -# but it does not matter whereto such a link points) -# then remove the link because CUPS' own Monospace fonts -# are provided by this package in the /usr/share/cups/fonts/ -# directory but RPM cannot replace a symbolic link by a directory -# (RPM would complain with "file /usr/share/cups/fonts -# from install of cups- conflicts -# with file from package cups-") -# see https://bugzilla.novell.com/show_bug.cgi?id=856731#c6 -test -L %{_datadir}/cups/fonts && rm %{_datadir}/cups/fonts exit 0 %post