Hello community, here is the log from the commit of package ghostscript-library for openSUSE:Factory checked in at Wed Jul 8 23:08:29 CEST 2009. -------- --- ghostscript-library/ghostscript-library.changes 2009-06-26 17:46:48.000000000 +0200 +++ ghostscript-library/ghostscript-library.changes 2009-07-08 18:16:32.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 8 18:13:55 CEST 2009 - werner@suse.de + +- Fix bnc#509903 caused by a fix for bnc#409605 which is not + needed anymore + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:55.000000000 +0200 @@ -20,7 +20,7 @@ Name: ghostscript-library %if "%name" != "ghostscript-mini" -BuildRequires: cups-devel cups-libs dos2unix ed gcc-c++ glib2-devel libpng-devel libtiff-devel libxml2-devel t1utils xorg-x11-devel zlib-devel +BuildRequires: cups-devel cups-libs dos2unix ed fontconfig-devel gcc-c++ glib2-devel libpng-devel libtiff-devel libxml2-devel t1utils xorg-x11-devel zlib-devel %if %suse_version > 1020 BuildRequires: fdupes flex libexpat-devel libjasper-devel libopenssl-devel pkg-config %else @@ -61,7 +61,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.64 -Release: 1 +Release: 2 License: GPL v2 or later Source0: ghostscript-8.64.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 @@ -322,7 +322,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 309 +Release: 310 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -338,7 +338,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 309 +Release: 310 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -454,8 +454,11 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[123]/-O1}" %endif # +%if %{?_with_debug:1}%{!?_with_debug:0} + DEBUG="-g3 -DDEBUG" +%else DEBUG="" -# DEBUG="-g3 -DDEBUG" +%endif LATECFLAGS="" LATECXXFLAGS="" cflags () @@ -473,7 +476,9 @@ eval $var=\${$var:+\$$var\ }$flag fi } +%if %suse_version > 1010 cflags -fno-const-strings LATECFLAGS LATECXXFLAGS +%endif cflags -Wno-write-strings LATECFLAGS LATECXXFLAGS cflags -Wno-return-type LATECFLAGS LATECXXFLAGS cflags -Wno-unknown-pragmas LATECFLAGS LATECXXFLAGS @@ -807,6 +812,25 @@ %endif # tar xfj %{S:1} -C %{buildroot}%{_datadir}/ghostscript/ + fdupes -q -r %{buildroot}%{_datadir}/ghostscript/%{gsver}/Resource/Font/ %{buildroot}%{_datadir}/ghostscript/fonts/ | \ + while read file; do + if test -z "$target" ; then + target="$file" + else + if test -z "$file" ; then + target="" + continue + fi + case "${target##*/}" in + fonts.*) continue + esac + ln -sf "../../../fonts/${file##*/}" "${target}" + case "${target##*/}" in + *Cond*) target=$(echo "${target}" | sed -r 's@(.*)(Bold|Regu)(Cond)(.*)@\1\3\2\4@') + ln -sf "../../../fonts/${file##*/}" "${target}" + esac + fi + done %if "%name" != "ghostscript-mini" list="$(sed -nr 's/^\+\+\+[[:blank:]]([^[:blank:]]+\.pfa).*/\1/p' %{P:24})" pushd %{buildroot}%{_datadir}/ghostscript/fonts/ ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:55.000000000 +0200 @@ -20,7 +20,7 @@ Name: ghostscript-mini %if "%name" != "ghostscript-mini" -BuildRequires: cups-devel cups-libs dos2unix ed gcc-c++ glib2-devel libpng-devel libtiff-devel libxml2-devel t1utils xorg-x11-devel zlib-devel +BuildRequires: cups-devel cups-libs dos2unix ed fontconfig-devel gcc-c++ glib2-devel libpng-devel libtiff-devel libxml2-devel t1utils xorg-x11-devel zlib-devel %if %suse_version > 1020 BuildRequires: fdupes flex libexpat-devel libjasper-devel libopenssl-devel pkg-config %else @@ -61,7 +61,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.64 -Release: 1 +Release: 2 License: GPL v2 or later Source0: ghostscript-8.64.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 @@ -322,7 +322,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 309 +Release: 310 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -338,7 +338,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 309 +Release: 310 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -454,8 +454,11 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[123]/-O1}" %endif # +%if %{?_with_debug:1}%{!?_with_debug:0} + DEBUG="-g3 -DDEBUG" +%else DEBUG="" -# DEBUG="-g3 -DDEBUG" +%endif LATECFLAGS="" LATECXXFLAGS="" cflags () @@ -473,7 +476,9 @@ eval $var=\${$var:+\$$var\ }$flag fi } +%if %suse_version > 1010 cflags -fno-const-strings LATECFLAGS LATECXXFLAGS +%endif cflags -Wno-write-strings LATECFLAGS LATECXXFLAGS cflags -Wno-return-type LATECFLAGS LATECXXFLAGS cflags -Wno-unknown-pragmas LATECFLAGS LATECXXFLAGS @@ -807,6 +812,25 @@ %endif # tar xfj %{S:1} -C %{buildroot}%{_datadir}/ghostscript/ + fdupes -q -r %{buildroot}%{_datadir}/ghostscript/%{gsver}/Resource/Font/ %{buildroot}%{_datadir}/ghostscript/fonts/ | \ + while read file; do + if test -z "$target" ; then + target="$file" + else + if test -z "$file" ; then + target="" + continue + fi + case "${target##*/}" in + fonts.*) continue + esac + ln -sf "../../../fonts/${file##*/}" "${target}" + case "${target##*/}" in + *Cond*) target=$(echo "${target}" | sed -r 's@(.*)(Bold|Regu)(Cond)(.*)@\1\3\2\4@') + ln -sf "../../../fonts/${file##*/}" "${target}" + esac + fi + done %if "%name" != "ghostscript-mini" list="$(sed -nr 's/^\+\+\+[[:blank:]]([^[:blank:]]+\.pfa).*/\1/p' %{P:24})" pushd %{buildroot}%{_datadir}/ghostscript/fonts/ ++++++ Omni-0.9.2-glibc210.dif ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:55.000000000 +0200 @@ -403,3 +403,24 @@ while (pszSlash) { +--- Omni/Makefile.am ++++ Omni/Makefile.am 2009-07-08 17:04:07.585903493 +0200 +@@ -104,6 +104,7 @@ libomni_la_SOURCES = BinaryData.cpp \ + PluggableBlitter.cpp + # PDCInterface.cpp + ++LDFLAGS = @LDFLAGS@ @GLIB_LIBS@ + libomni_la_LIBADD = $(top_builddir)/hppcl3/libbitmap.la $(top_builddir)/XMLLib/libOmniXMLLibrary.la + libomni_la_LDFLAGS = -version-info @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ @XML_LIBS@ + +--- Omni/XMLLib/Makefile.am ++++ Omni/XMLLib/Makefile.am 2009-07-08 17:03:26.653912614 +0200 +@@ -17,6 +17,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + ++LDFLAGS = @LDFLAGS@ @XML_LIBS@ + pkglib_LTLIBRARIES = libOmniXMLLibrary.la + + libOmniXMLLibrary_la_SOURCES = XMLInterface.cpp + LIBTOOL = @LIBTOOL@ ++++++ ghostscript-8.64-pdf.dif ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:56.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:56.000000000 +0200 @@ -49,32 +49,3 @@ /* * If there isn't a target, all we care about is the bounding box, ---- base/gdevpdfo.c -+++ base/gdevpdfo.c 2009-06-22 12:10:40.033901073 +0000 -@@ -1068,6 +1068,10 @@ cos_dict_equal(const cos_object_t *pco0, - - if (v == NULL) - return false; -+ -+ if (cos_type(v->contents.object) != cos_type_dict) -+ return false; /* Should _never_ happen */ -+ - code = cos_value_equal(&pcde0->value, v, pdev); - if (code < 0) - return code; ---- base/gdevpdfr.c -+++ base/gdevpdfr.c 2007-08-06 12:54:39.000000000 +0200 -@@ -307,8 +307,12 @@ pdf_scan_token(const byte **pscan, const - stream_cursor_write w; - stream_PSSD_state ss; - int status; -- -+#if 0 - s_PSSD_init((stream_state *)&ss); -+#else -+ s_PSSD_partially_init_inline(&ss); -+ ss.from_string = true; -+#endif - r.ptr = p; /* skip the '(' */ - r.limit = end - 1; - w.limit = buf + sizeof(buf) - 1; ++++++ ghostscript-8.64.dif ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:56.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:56.000000000 +0200 @@ -1162,7 +1162,7 @@ "/usr/lib/Omni/", "/opt/Omni/bin/", --- cups/cups.mak -+++ cups/cups.mak 2008-02-21 16:02:09.000000000 +0100 ++++ cups/cups.mak 2009-07-08 16:10:31.938401167 +0000 @@ -29,12 +29,12 @@ CUPS_MAK=cups/cups.mak cups_= $(GLOBJ)gdevcups.$(OBJ) @@ -1181,16 +1181,19 @@ $(SETPDEV2) $(DD)cups $(cups_) $(ADDMOD) $(DD)cups -libpath $(CUPSLIBDIRS) $(ADDMOD) $(DD)cups -lib $(CUPSLIBS) -@@ -51,7 +51,14 @@ pdftoraster_=cups/pdftoraster.c - $(PDFTORASTER_XE): $(pdftoraster_) - $(GLCC) `cups-config --image --libs` -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) +@@ -49,9 +49,16 @@ pdftoraster: $(PDFTORASTER_XE) + pdftoraster_=cups/pdftoraster.c + $(PDFTORASTER_XE): $(pdftoraster_) +- $(GLCC) `cups-config --image --libs` -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) ++ $(GLCC) -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) `cups-config --image --libs` ++ +cups/pstoraster: cups/pstoraster.in + sed -e 's|@prefix@|$(prefix)|' \ + -e 's|@exec_prefix@|$(exec_prefix)|' \ + -e 's|@bindir@|$(bindir)|' \ + -e 's|@GS@|$(GS)|' < cups/pstoraster.in > cups/pstoraster -+ + install: install-cups +soinstall: install-cups ++++++ make.catalog ++++++ --- /var/tmp/diff_new_pack.2skOds/_old 2009-07-08 23:07:58.000000000 +0200 +++ /var/tmp/diff_new_pack.2skOds/_new 2009-07-08 23:07:58.000000000 +0200 @@ -8,7 +8,7 @@ devices="$($gs -h 2>&1 | sed -n '/^Available devices:/,/Search path:/p' |\ grep -vE '(Available devices:|Search path:)' | tr ' ' '\n' | sort -u)" -descr="$(cat {src,contrib}/*.mak |\ +descr="$(cat $(find -name '*.mak') |\ sed -n "/Catalog/,/End of catalog/ { :join $!N ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org