Changes - j0ke.net Open Build Service

Changes of Revision 65

[-] [+]	Changed	PDFlib-Lite.spec
@@ -17,10 +17,14 @@ %define tcl_version %(echo 'puts [package require Tcl]' \| tclsh \| awk -F. '{print $1"."$2}') %endif -%if 0%{?centos_version} >= 5 \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} >= 500 +%if 0%{?centos_version} >= 5 \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 BuildRequires: libtool-ltdl-devel %endif +%if 0%{?rhel_version} >= 600 +BuildRequires: libtool-ltdl perl-devel +%endif + # define extra macros %if 0%{?centos_version} \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} %ifarch x86_64 @@ -98,7 +102,11 @@ %files perl %defattr(-,root,root,-) +%if 0%{?rhel_version} >= 600 +%{_libdir}/perl5/pdflib_pl.so* +%else %{perl_vendorlib}/pdflib_pl.so* +%endif %{perl_vendorlib}/pdflib_pl.pm @@ -113,9 +121,13 @@ %files perl-devel %defattr(-,root,root,-) +%if 0%{?rhel_version} >= 600 +%{_libdir}/perl5/pdflib_pl.a +%{_libdir}/perl5/pdflib_pl.la +%else %{perl_vendorlib}/pdflib_pl.a %{perl_vendorlib}/pdflib_pl.la - +%endif ###################################################################### %package tcl @@ -273,6 +285,7 @@ %install %{__make} DESTDIR=$RPM_BUILD_ROOT install +mkdir -p %{buildroot}%{perl_vendorlib} mv %{buildroot}%{perl_vendorarch} %{buildroot}%{perl_vendorlib}/pdflib_pl.pm %perl_process_packlist x 1 @@ -17,10 +17,14 @@ 2 %define tcl_version %(echo 'puts [package require Tcl]' \| tclsh \| awk -F. '{print $1"."$2}') 3 %endif 4 5 -%if 0%{?centos_version} >= 5 \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} >= 500 6 +%if 0%{?centos_version} >= 5 \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 7 BuildRequires: libtool-ltdl-devel 8 %endif 9 10 +%if 0%{?rhel_version} >= 600 11 +BuildRequires: libtool-ltdl perl-devel 12 +%endif 13 + 14 # define extra macros 15 %if 0%{?centos_version} \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} 16 %ifarch x86_64 17 @@ -98,7 +102,11 @@ 18 19 %files perl 20 %defattr(-,root,root,-) 21 +%if 0%{?rhel_version} >= 600 22 +%{_libdir}/perl5/pdflib_pl.so* 23 +%else 24 %{perl_vendorlib}/pdflib_pl.so* 25 +%endif 26 %{perl_vendorlib}/pdflib_pl.pm 27 28 29 @@ -113,9 +121,13 @@ 30 31 %files perl-devel 32 %defattr(-,root,root,-) 33 +%if 0%{?rhel_version} >= 600 34 +%{_libdir}/perl5/pdflib_pl.a 35 +%{_libdir}/perl5/pdflib_pl.la 36 +%else 37 %{perl_vendorlib}/pdflib_pl.a 38 %{perl_vendorlib}/pdflib_pl.la 39 - 40 +%endif 41 42 ###################################################################### 43 %package tcl 44 @@ -273,6 +285,7 @@ 45 %install 46 47 %{__make} DESTDIR=$RPM_BUILD_ROOT install 48 +mkdir -p %{buildroot}%{perl_vendorlib} 49 mv %{buildroot}%{perl_vendorarch} %{buildroot}%{perl_vendorlib}/pdflib_pl.pm 50 %perl_process_packlist 51 52
[-] [+]	Added	704_705.diff ^
@@ -0,0 +1,27175 @@ +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/businesscard.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/businesscard.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/businesscard.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/businesscard.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -23,7 +23,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +@@ -83,7 +83,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/businesscard.pch" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/chartab.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/chartab.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/chartab.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/chartab.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -22,7 +22,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/chartab.pch" +@@ -85,7 +85,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/hello.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/hello.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/hello.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/hello.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -22,7 +22,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/hello.pch" +@@ -85,7 +85,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/image.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/image.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/image.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/image.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -23,7 +23,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +@@ -83,7 +83,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/image.pch" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/invoice.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/invoice.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/invoice.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/invoice.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -22,7 +22,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/invoice.pch" +@@ -85,7 +85,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/pdfclock.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/pdfclock.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/pdfclock.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/pdfclock.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -22,7 +22,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/pdfclock.pch" +@@ -85,7 +85,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/quickreference.vcproj PDFlib-Lite-7.0.5/bind/pdflib/c/quickreference.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/c/quickreference.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/quickreference.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -23,7 +23,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +@@ -83,7 +83,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;PDFLIB_STATIC;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile=".\Debug/quickreference.pch" +Dateien PDFlib-Lite-7.0.4/bind/pdflib/c/samples.mcp und PDFlib-Lite-7.0.5/bind/pdflib/c/samples.mcp sind verschieden. +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/c/starter_type3font.c PDFlib-Lite-7.0.5/bind/pdflib/c/starter_type3font.c +--- PDFlib-Lite-7.0.4/bind/pdflib/c/starter_type3font.c 2009-06-08 17:57:33.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/c/starter_type3font.c 2010-04-29 15:50:10.000000000 +0200 +@@ -1,4 +1,4 @@ +-/* $Id: starter_type3font.c,v 1.1.2.6 2008/04/30 15:30:07 rjs Exp $ ++/* $Id: starter_type3font.c,v 1.1.2.7 2009/11/16 10:30:42 kurt Exp $ + * Type 3 font starter: + * Create a simple Type 3 font from vector data + * +@@ -61,11 +61,11 @@ + PDF_end_glyph(p); + PDF_begin_glyph(p, "space", 266, 0, 0, 0, 0); + PDF_end_glyph(p); +- PDF_begin_glyph(p, "l", 266, 69, 0, 197, 530); ++ PDF_begin_glyph(p, "l", 266, 0, 0, 266, 570); + PDF_setlinewidth(p, 20); + PDF_setdash(p, 0, 0); + x = 197; +- y = 0; ++ y = 10; + PDF_moveto(p, x, y); + y += 530; + PDF_lineto(p, x, y); +@@ -76,7 +76,6 @@ + x += 128; + PDF_lineto(p, x, y); + +- PDF_closepath(p); + PDF_stroke(p); + PDF_end_glyph(p); + +diff -uNr PDFlib-Lite-7.0.4/bind/pdflib/cpp/businesscard.vcproj PDFlib-Lite-7.0.5/bind/pdflib/cpp/businesscard.vcproj +--- PDFlib-Lite-7.0.4/bind/pdflib/cpp/businesscard.vcproj 2009-06-08 17:57:26.000000000 +0200 ++++ PDFlib-Lite-7.0.5/bind/pdflib/cpp/businesscard.vcproj 2010-04-29 15:50:03.000000000 +0200 +@@ -23,7 +23,7 @@ + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_MT" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" +@@ -84,7 +84,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../libs/pdflib,../../pdflib" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MT" ++ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;_MT" + RuntimeLibrary="1" + UsePrecompiledHeader="2"
[-] [+]	Changed	PDFlib-Lite-7.0.5_perlvendor.diff ^
@@ -1,5 +1,5 @@ --- configure.orig 2010-04-29 15:50:03.000000000 +0200 -+++ configure 2010-05-05 22:57:49.261029566 +0200 ++++ configure 2010-11-18 23:18:03.480683686 +0100 @@ -19678,7 +19678,7 @@ WITH_PERL=no fi @@ -9,7 +9,19 @@ if test -z "$PERLLIBDIR" -o ! -d "$PERLLIBDIR"; then echo "$as_me:$LINENO: result: unable to determine perl shared library directory" >&5 echo "${ECHO_T}unable to determine perl shared library directory" >&6 -@@ -21422,6 +21422,40 @@ +@@ -19759,6 +19759,11 @@ + echo $ECHO_N "checking for Python header files... $ECHO_C" >&6 + + dirs="$PYINCLUDE \ ++ $PYINCLUDE/python2.6 \ ++ $prefix/include/python2.6 \ ++ /usr/local/include/python2.6 \ ++ /usr/include/python2.6 \ ++ $prefix/include/python2.6 \ + $PYINCLUDE/python2.5 \ + $prefix/include/python2.5 \ + /usr/local/include/python2.5 \ +@@ -21422,6 +21427,40 @@ TETBINDINGS="$TETBINDINGS java" PCOSBINDINGS="$PCOSBINDINGS java" fi
[-] [+]	Added	PDFlib-Lite-7.0.5_perlvendor.diff.old ^
@@ -0,0 +1,52 @@ +--- configure.orig 2010-04-29 15:50:03.000000000 +0200 ++++ configure 2010-05-05 22:57:49.261029566 +0200 +@@ -19678,7 +19678,7 @@ + WITH_PERL=no + fi + +- PERLLIBDIR=`($PERL -e 'use Config; print $Config{sitearchexp};') 2>/dev/null` ++ PERLLIBDIR=`($PERL -e 'use Config; print $Config{vendorarchexp};') 2>/dev/null` + if test -z "$PERLLIBDIR" -o ! -d "$PERLLIBDIR"; then + echo "$as_me:$LINENO: result: unable to determine perl shared library directory" >&5 + echo "${ECHO_T}unable to determine perl shared library directory" >&6 +@@ -21422,6 +21422,40 @@ + TETBINDINGS="$TETBINDINGS java" + PCOSBINDINGS="$PCOSBINDINGS java" + fi ++if test "$WITH_PERL" = "yes" ; then ++ # don't add perl to bindings if compiler is not gcc on Solaris ++ # it won't build ++ SKIP_PERLBINDING="no" ++ case $ac_sys_system in ++ SunOS) ++ if test "$GCC" = ""; then ++ SKIP_PERLBINDING="yes" ++ fi; ++ esac ++ if test "$SKIP_PERLBINDING" = "no"; then ++ BINDINGS="$BINDINGS perl" ++ PLOPBINDINGS="$PLOPBINDINGS perl" ++ TETBINDINGS="$TETBINDINGS perl" ++ fi ++fi ++if test "$WITH_PYTHON" = "yes" ; then ++ BINDINGS="$BINDINGS python" ++fi ++if test "$WITH_RUBY" = "yes" ; then ++ SKIP_RUBBYBINDING="no" ++ case $ac_sys_system in ++ SunOS) ++ if test "$GCC" = ""; then ++ SKIP_RUBBYBINDING="yes" ++ fi; ++ esac ++ if test "$SKIP_RUBBYBINDING" = "no"; then ++ BINDINGS="$BINDINGS ruby" ++ fi ++fi ++if test "$WITH_TCL" = "yes" ; then ++ BINDINGS="$BINDINGS tcl" ++fi + + if test -f progs/Makefile ; then + PROGSDIR="progs"