diff --git a/cups.changes b/cups.changes index e18051e..94c6830 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 5833130..33ef0a5 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: cups BuildRequires: dbus-1-devel BuildRequires: fdupes @@ -471,6 +470,17 @@ 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