pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert last change that tried to remove the

Browse Source 
/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
This commit is contained in:
Johannes Meixner 2014-01-10 10:11:34 +00:00 committed by Git OBS Bridge
parent 08b481d570
commit 53b9657b27
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cups.changes
View File

@ -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-<new.version> conflicts
with file from package cups-<old.version>")
see https://bugzilla.novell.com/show_bug.cgi?id=856731#c6
-------------------------------------------------------------------
Wed Jan 8 16:07:44 CET 2014 - jsmeix@suse.de

12
cups.spec
View File

@ -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-<new.version> conflicts
# with file from package cups-<old.version>")
# see https://bugzilla.novell.com/show_bug.cgi?id=856731#c6
test -L %{_datadir}/cups/fonts && rm %{_datadir}/cups/fonts
exit 0
%post