Hello community, here is the log from the commit of package ghostscript for openSUSE:Factory checked in at 2012-05-09 18:09:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghostscript (Old) and /work/SRC/openSUSE:Factory/.ghostscript.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghostscript", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ghostscript/ghostscript-mini.changes 2012-04-23 16:07:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript-mini.changes 2012-05-09 18:28:52.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 24 14:30:45 CEST 2012 - jsmeix@suse.de + +- Install documentation which is not installed by default + (LICENSE doc/AUTHORS doc/COPYING doc/thirdparty.htm + doc/WhatIsGS.htm doc/GS9_Color_Management.pdf + doc/gs-vms.hlp doc/Ps2ps2.htm). +- Add a link from SUSE's usual documentation directory + (/usr/share/doc/packages/ghostscript/) to Ghostscript's + documentation directory (/usr/share/ghostscript/9.05/doc/) + because "configure --docdir=..." does not work. +- Let ghostscript-mini "Conflicts: ghostscript-library". + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ghostscript/ghostscript.changes 2012-04-23 16:07:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript.changes 2012-05-09 18:28:52.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Apr 27 10:40:53 CEST 2012 - jsmeix@suse.de + +- BuildRequires dbus-1-devel for "configure --enable-dbus" + to have colord support in gstoraster (see the entry regarding + "color management daemon" in doc/History9.htm). + +------------------------------------------------------------------- +Tue Apr 24 14:30:45 CEST 2012 - jsmeix@suse.de + +- Install documentation which is not installed by default + (LICENSE doc/AUTHORS doc/COPYING doc/thirdparty.htm + doc/WhatIsGS.htm doc/GS9_Color_Management.pdf + doc/gs-vms.hlp doc/Ps2ps2.htm). +- Add a link from SUSE's usual documentation directory + (/usr/share/doc/packages/ghostscript/) to Ghostscript's + documentation directory (/usr/share/ghostscript/9.05/doc/) + because "configure --docdir=..." does not work. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.KfLZ0q/_old 2012-05-09 18:28:57.000000000 +0200 +++ /var/tmp/diff_new_pack.KfLZ0q/_new 2012-05-09 18:28:57.000000000 +0200 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ghostscript-mini BuildRequires: freetype2-devel BuildRequires: liblcms-devel @@ -25,13 +23,12 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: zlib-devel -AutoReqProv: on Summary: Minimal Ghostscript for minimal build requirements -Group: System/Libraries License: GPL-3.0 +Group: System/Libraries Url: http://www.ghostscript.com/ Version: 9.05 -Release: 1 +Release: 0 # Source0...Source9 is for sources from upstream: # URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.05.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS @@ -50,6 +47,7 @@ Conflicts: ghostscript Conflicts: ghostscript-x11 Conflicts: ghostscript-devel +Conflicts: ghostscript-library # Require only the basic fonts for Ghostscript (but do not recommend ghostscript-fonts-other): Requires: ghostscript-fonts-std # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: @@ -72,6 +70,16 @@ has minimal build dependencies (in particular neither CUPS nor X11 build dependencies). +For most packages which need to only run +Ghostscript during build, a single line +"BuildRequires: ghostscript-mini" +should be sufficient in the RPM spec file. + +For most packages which need Ghostscript +development files to build, a single line +"BuildRequires: ghostscript-mini-devel" +should be sufficient in the RPM spec file. + The ghostscript-mini package in the openSUSE build service contains no sources and it must not contain any source files. The ghostscript-mini package is only @@ -82,13 +90,13 @@ package will be rejected in the openSUSE build service. %package devel -License: GPL-3.0 Summary: Development files for Minimal Ghostscript +Group: Development/Libraries/C and C++ Requires: ghostscript-mini = %{version} Conflicts: ghostscript Conflicts: ghostscript-x11 Conflicts: ghostscript-devel -Group: Development/Libraries/C and C++ +Conflicts: ghostscript-library %description devel This package contains the development files for Minimal Ghostscript. @@ -102,8 +110,10 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -fi +# --docdir=%%{_defaultdocdir}/%%{name} does not work therefore it is not used. # --disable-cups and --without-pdftoraster and --without-install-cups # to have nothing related to CUPS in the minimal Ghostscript. +# --disable-dbus to have nothing related to D-Bus in the minimal Ghostscript. # --without-ijs to disable IJS printer driver support in the minimal Ghostscript. # --with-drivers=FILES to have only the file format drivers # but no printer drivers in the minimal Ghostscript. @@ -124,17 +134,17 @@ # "checking for libtiff with pkg-config... checking for TIFFOpen in -ltiff... no # configure: Could not find a copy of libtiff on your system. # Disabling tiff output devices." -# regardless of "BuildRequires libtiff-devel" which works everywhere except openSUSE:Factory +# regardless of "BuildRequires libtiff-devel" which works everywhere except openSUSE:Factory. %define with_or_without_system_libtiff --without-system-libtiff %else %define with_or_without_system_libtiff --with-system-libtiff %endif ./configure --prefix=%{_prefix} \ --bindir=%{_bindir} \ - --mandir=%{_mandir} \ + --libdir=%{_libdir} \ --datadir=%{_datadir} \ + --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --libdir=%{_libdir} \ --with-fontpath=%{gs_font_path} \ --with-libiconv=maybe \ %{with_or_without_system_libtiff} \ @@ -145,6 +155,7 @@ --enable-openjpeg \ --enable-dynamic \ --disable-cups \ + --disable-dbus \ --without-pdftoraster \ --without-install-cups \ --with-drivers=FILES \ @@ -156,13 +167,27 @@ --without-luratech \ --without-libpaper make -# make libgs.so and two programs which use it, gsx and gsc: +# Make libgs.so and two programs which use it, gsx and gsc: make so %install make install DESTDIR=%{buildroot} -# install libgs.so gsx gsc and some header files: +# Install libgs.so gsx gsc and some header files: make soinstall DESTDIR=%{buildroot} +# Install documentation which is not installed by default +# see http://bugs.ghostscript.com/show_bug.cgi?id=693002 +# and fail intentionally as notification if something changed: +DOCDIR=%{buildroot}%{_datadir}/ghostscript/%{version}/doc +for D in LICENSE doc/AUTHORS doc/COPYING doc/thirdparty.htm doc/WhatIsGS.htm doc/GS9_Color_Management.pdf doc/gs-vms.hlp doc/Ps2ps2.htm +do test -e $DOCDIR/$( basename $D ) && exit 99 + install -m 644 $D $DOCDIR +done +# Add a link from SUSE's usual documentation directory to Ghostscript's documentation directory +# because "configure --docdir=%%{_defaultdocdir}/%%{name}" does not work (see above): +install -d -m755 %{buildroot}%{_defaultdocdir} +pushd %{buildroot}%{_defaultdocdir} +ln -s ../../ghostscript/%{version}/doc ghostscript +popd # Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe # see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets @@ -250,7 +275,14 @@ %doc %{_mandir}/de/man1/ps2pdf14.1.gz %doc %{_mandir}/de/man1/ps2ps.1.gz %doc %{_mandir}/de/man1/wftopfa.1.gz -%{_datadir}/ghostscript/ +%doc %{_defaultdocdir}/ghostscript +%dir %{_datadir}/ghostscript +%dir %{_datadir}/ghostscript/%{version} +%doc %{_datadir}/ghostscript/%{version}/doc/ +%{_datadir}/ghostscript/%{version}/examples/ +%{_datadir}/ghostscript/%{version}/iccprofiles/ +%{_datadir}/ghostscript/%{version}/lib/ +%{_datadir}/ghostscript/%{version}/Resource/ %{_libdir}/libgs.so.* %{_libdir}/ghostscript/ ++++++ ghostscript.spec ++++++ --- /var/tmp/diff_new_pack.KfLZ0q/_old 2012-05-09 18:28:57.000000000 +0200 +++ /var/tmp/diff_new_pack.KfLZ0q/_new 2012-05-09 18:28:57.000000000 +0200 @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ghostscript BuildRequires: cups-devel +# dbus-1-devel is needed for "configure --enable-dbus" (see below): +BuildRequires: dbus-1-devel BuildRequires: freetype2-devel BuildRequires: libexpat-devel BuildRequires: liblcms-devel @@ -30,13 +30,12 @@ BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-fonts BuildRequires: zlib-devel -AutoReqProv: on Summary: The Ghostscript interpreter for PostScript and PDF -Group: System/Libraries License: GPL-3.0 +Group: System/Libraries Url: http://www.ghostscript.com/ Version: 9.05 -Release: 1 +Release: 0 # Source0...Source9 is for sources from upstream: # URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.05.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS @@ -165,7 +164,6 @@ %package x11 Summary: X11 library for Ghostscript Group: Productivity/Publishing/PS -License: GPL-3.0 # Require the exact matching version-release of the ghostscript main-package because # a non-matching ghostscript main-package may let it fail or even crash (e.g. segfault) # because all Ghostscript software is built from one same Ghostscript source tar ball @@ -185,8 +183,8 @@ # The RPM documentation http://www.rpm.org/max-rpm/s1-rpm-depend-manual-dependencies.html # and /usr/share/doc/packages/rpm/manual/dependencies (in rpm-4.8.0 in openSUSE 11.4) # does not show a comparison operator for "not equal" so that two conflicts are used: -Conflicts: ghostscript-library < %{version}-%{release} -Conflicts: ghostscript-library > %{version}-%{release} +Conflicts: ghostscript-library < %{version} +Conflicts: ghostscript-library > %{version} Conflicts: ghostscript-mini # In openSUSE:Factory (dated 22 Feb. 2012) ghostview gv and texlive-bin require ghostscript_x11 (see above): Provides: ghostscript_x11 @@ -197,8 +195,8 @@ under the X Window System. %package devel -License: GPL-3.0 Summary: Development files for Ghostscript +Group: Development/Libraries/C and C++ Requires: ghostscript = %{version} # Unfortunately ghostscript-library.spec and ghostscript-mini.spec have # an unversioned "Provides: ghostscript" and for RPM this means that both @@ -215,7 +213,6 @@ Conflicts: ghostscript-library > %{version} Conflicts: ghostscript-mini Conflicts: ghostscript-mini-devel -Group: Development/Libraries/C and C++ %description devel This package contains the development files for Ghostscript. @@ -229,10 +226,12 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -fi +# --docdir=%%{_defaultdocdir}/%%{name} does not work therefore it is not used. # --enable-cups and --with-pdftoraster and --with-install-cups # (--with-install-cups is new since version 9.04) # to make and install cups/filter/gstoraster and cups/filter/gstopxl # and related files (gstoraster.convs pxlcolor.ppd pxlmono.ppd). +# --enable-dbus to have colord support in gstoraster, see cups/colord.c (colord is accessed via D-Bus). # --with-ijs to enable IJS printer driver support (in particular needed by HPIJS). # --with-drivers=ALL to all file format drivers and all printer drivers. # --with-x to use the X Window System. @@ -252,17 +251,17 @@ # "checking for libtiff with pkg-config... checking for TIFFOpen in -ltiff... no # configure: Could not find a copy of libtiff on your system. # Disabling tiff output devices." -# regardless of "BuildRequires libtiff-devel" which works everywhere except openSUSE:Factory +# regardless of "BuildRequires libtiff-devel" which works everywhere except openSUSE:Factory. %define with_or_without_system_libtiff --without-system-libtiff %else %define with_or_without_system_libtiff --with-system-libtiff %endif ./configure --prefix=%{_prefix} \ --bindir=%{_bindir} \ - --mandir=%{_mandir} \ + --libdir=%{_libdir} \ --datadir=%{_datadir} \ + --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --libdir=%{_libdir} \ --with-fontpath=%{gs_font_path} \ --with-libiconv=maybe \ %{with_or_without_system_libtiff} \ @@ -273,6 +272,7 @@ --enable-openjpeg \ --enable-dynamic \ --enable-cups \ + --enable-dbus \ --with-pdftoraster \ --with-install-cups \ --with-drivers=ALL \ @@ -284,13 +284,27 @@ --without-luratech \ --without-libpaper make -# make libgs.so and two programs which use it, gsx and gsc: +# Make libgs.so and two programs which use it, gsx and gsc: make so %install make install DESTDIR=%{buildroot} -# install libgs.so gsx gsc and some header files: +# Install libgs.so gsx gsc and some header files: make soinstall DESTDIR=%{buildroot} +# Install documentation which is not installed by default +# see http://bugs.ghostscript.com/show_bug.cgi?id=693002 +# and fail intentionally as notification if something changed: +DOCDIR=%{buildroot}%{_datadir}/ghostscript/%{version}/doc +for D in LICENSE doc/AUTHORS doc/COPYING doc/thirdparty.htm doc/WhatIsGS.htm doc/GS9_Color_Management.pdf doc/gs-vms.hlp doc/Ps2ps2.htm +do test -e $DOCDIR/$( basename $D ) && exit 99 + install -m 644 $D $DOCDIR +done +# Add a link from SUSE's usual documentation directory to Ghostscript's documentation directory +# because "configure --docdir=%%{_defaultdocdir}/%%{name}" does not work (see above): +install -d -m755 %{buildroot}%{_defaultdocdir} +pushd %{buildroot}%{_defaultdocdir} +ln -s ../../ghostscript/%{version}/doc ghostscript +popd # Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe # see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets @@ -387,7 +401,14 @@ %doc %{_mandir}/de/man1/ps2pdf14.1.gz %doc %{_mandir}/de/man1/ps2ps.1.gz %doc %{_mandir}/de/man1/wftopfa.1.gz -%{_datadir}/ghostscript/ +%doc %{_defaultdocdir}/ghostscript +%dir %{_datadir}/ghostscript +%dir %{_datadir}/ghostscript/%{version} +%doc %{_datadir}/ghostscript/%{version}/doc/ +%{_datadir}/ghostscript/%{version}/examples/ +%{_datadir}/ghostscript/%{version}/iccprofiles/ +%{_datadir}/ghostscript/%{version}/lib/ +%{_datadir}/ghostscript/%{version}/Resource/ %{_libdir}/libgs.so.* %{_libdir}/ghostscript/ %exclude %{_libdir}/ghostscript/%{version}/X11.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org