Hello community, here is the log from the commit of package ghostscript-library checked in at Fri Feb 1 01:30:47 CET 2008. -------- --- ghostscript-library/ghostscript-library.changes 2007-11-22 12:16:49.000000000 +0100 +++ ghostscript-library/ghostscript-library.changes 2008-01-31 14:57:35.352262000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 14:55:27 CET 2008 - werner@suse.de + +- ghostscript-mini: No self conflict but provide + ghostscript-fonts-std and ghostscript-library + +------------------------------------------------------------------- --- ghostscript-library/ghostscript-mini.changes 2007-11-22 12:16:52.000000000 +0100 +++ ghostscript-library/ghostscript-mini.changes 2008-01-31 14:57:38.024602000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 14:55:27 CET 2008 - werner@suse.de + +- ghostscript-mini: No self conflict but provide + ghostscript-fonts-std and ghostscript-library + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.YJ5786/_old 2008-02-01 01:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.YJ5786/_new 2008-02-01 01:28:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghostscript-library (Version 8.60) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -40,15 +40,20 @@ Group: System/Libraries Provides: ghostscript gs gs_lib pstoraster ghostscript_any Obsoletes: gs_lib ghostscript-serv +%if "%name" != "ghostscript-mini" %if %suse_version > 1000 Suggests: hplip-hpijs %else Requires: hplip-hpijs %endif %if %suse_version > 1000 -Recommends: ghostscript-omni +Recommends: ghostscript-omni ghostscript-fonts-other %endif +Requires: ghostscript-fonts-std Conflicts: ghostscript-mini +%else +Provides: ghostscript-library ghostscript-fonts-std +%endif AutoReqProv: on %if "%name" != "ghostscript-mini" Summary: Necessary Files for Running Ghostscript @@ -56,7 +61,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.60 -Release: 8 +Release: 27 License: GPL v2 or later Source0: ghostscript-8.60.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 @@ -150,7 +155,7 @@ %package -n ghostscript-x11 Conflicts: ghostscript-vga ghostscript-both PreReq: coreutils -Requires: ghostscript-library ghostscript-fonts-std +Requires: ghostscript-library Summary: Ghostscript for the X Window System Group: Productivity/Publishing/PS Provides: ghostscript_any gs_x11 ghostscript_x11 @@ -301,7 +306,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 198 +Release: 217 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -316,7 +321,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 198 +Release: 217 Requires: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -1001,6 +1006,7 @@ %{_libdir}/pkgconfig/ijs.pc %endif %dir %{_libdir}/ghostscript +%dir %{_libdir}/ghostscript/%{gsver} %dir %{_libdir}/cups %dir %{_libdir}/cups/filter %{_libdir}/cups/filter/pstoraster @@ -1021,7 +1027,6 @@ %files -n ghostscript-x11 %defattr(-, root, root) -%dir %{_libdir}/ghostscript/%{gsver} %{_libdir}/ghostscript/%{gsver}/X11.so %{_datadir}/pixmaps/* %if %suse_version > 1020 ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.YJ5786/_old 2008-02-01 01:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.YJ5786/_new 2008-02-01 01:28:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghostscript-mini (Version 8.60) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -40,15 +40,20 @@ Group: System/Libraries Provides: ghostscript gs gs_lib pstoraster ghostscript_any Obsoletes: gs_lib ghostscript-serv +%if "%name" != "ghostscript-mini" %if %suse_version > 1000 Suggests: hplip-hpijs %else Requires: hplip-hpijs %endif %if %suse_version > 1000 -Recommends: ghostscript-omni +Recommends: ghostscript-omni ghostscript-fonts-other %endif +Requires: ghostscript-fonts-std Conflicts: ghostscript-mini +%else +Provides: ghostscript-library ghostscript-fonts-std +%endif AutoReqProv: on %if "%name" != "ghostscript-mini" Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) @@ -56,7 +61,7 @@ Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) %endif Version: 8.60 -Release: 7 +Release: 20 License: GPL v2 or later Source0: ghostscript-8.60.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 @@ -143,7 +148,7 @@ %package -n ghostscript-x11 Conflicts: ghostscript-vga ghostscript-both PreReq: coreutils -Requires: ghostscript-library ghostscript-fonts-std +Requires: ghostscript-library Summary: Ghostscript for the X Window System Group: Productivity/Publishing/PS Provides: ghostscript_any gs_x11 ghostscript_x11 @@ -294,7 +299,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 198 +Release: 217 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -309,7 +314,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 198 +Release: 217 Requires: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -994,6 +999,7 @@ %{_libdir}/pkgconfig/ijs.pc %endif %dir %{_libdir}/ghostscript +%dir %{_libdir}/ghostscript/%{gsver} %dir %{_libdir}/cups %dir %{_libdir}/cups/filter %{_libdir}/cups/filter/pstoraster @@ -1014,7 +1020,6 @@ %files -n ghostscript-x11 %defattr(-, root, root) -%dir %{_libdir}/ghostscript/%{gsver} %{_libdir}/ghostscript/%{gsver}/X11.so %{_datadir}/pixmaps/* %if %suse_version > 1020 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org