commit GraphicsMagick for openSUSE:Factory

4 Dec 2009

Hello community,

here is the log from the commit of package GraphicsMagick for openSUSE:Factory
checked in at Fri Dec 4 12:37:48 CET 2009.



--------

--- GraphicsMagick/GraphicsMagick.changes	2009-11-03 20:18:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick.changes	2009-11-23 17:28:10.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 23 17:05:42 CET 2009 - pgajdos@suse.cz
+
+- updated to version 1.3.7 (see ChangeLog)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  GraphicsMagick-1.2.7-CVE-2008-1097.patch
  GraphicsMagick-1.2.7-debian-fixed.patch
  GraphicsMagick-1.2.7-include.patch
  GraphicsMagick-1.2.7-perl.patch
  GraphicsMagick-1.2.7.tar.bz2

New:
----
  GraphicsMagick-1.3.7-debian-fixed.patch
  GraphicsMagick-1.3.7-include.patch
  GraphicsMagick-1.3.7-perl.patch
  GraphicsMagick-1.3.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ GraphicsMagick.spec ++++++
--- /var/tmp/diff_new_pack.zwmO6k/_old	2009-12-04 12:34:35.000000000 +0100
+++ /var/tmp/diff_new_pack.zwmO6k/_new	2009-12-04 12:34:35.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package GraphicsMagick (Version 1.2.7)
+# spec file for package GraphicsMagick (Version 1.3.7)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,25 +18,19 @@
 
 
 Name:           GraphicsMagick
-BuildRequires:  cups-client dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std ghostscript-library liblcms-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig
-%if %suse_version > 1020
-BuildRequires:  libjasper-devel
-%else
-BuildRequires:  libjasper
-%endif
+BuildRequires:  cups-client dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std ghostscript-library libjasper-devel liblcms-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig
 # Define Quantum depth
 %define quant 8
-%define base_version 1.2.7
+%define base_version 1.3.7
 Summary:        Viewer and Converter for Images
-Version:        1.2.7
-Release:        2
+Version:        1.3.7
+Release:        1
 License:        MIT License (or similar)
 Group:          Productivity/Graphics/Convertors
 Source:         ftp://ftp.GraphicsMagick.org/pub/%{name}/%{name}-%{version}.tar.bz2
 Patch2:         %{name}-%{version}-debian-fixed.patch
 Patch4:         %{name}-%{version}-perl.patch
 Patch10:        %{name}-%{version}-include.patch
-Patch12:        %{name}-%{version}-CVE-2008-1097.patch
 Url:            http://www.GraphicsMagick.org/
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -66,12 +60,12 @@
 --------
     see the AUTHORS file
 
-%package -n libGraphicsMagick2
+%package -n libGraphicsMagick3
 License:        MIT License (or similar)
 Summary:        Viewer and Converter for Images - runtime library
 Group:          Productivity/Graphics/Convertors
 
-%description -n libGraphicsMagick2
+%description -n libGraphicsMagick3
 GraphicsMagick(TM) provides a powerful image manipulation and
 translation utility. It is capable of displaying still images and
 animations using the X Window system, provides a simple interface for
@@ -97,12 +91,12 @@
 --------
     see the AUTHORS file
 
-%package -n libGraphicsMagickWand1
+%package -n libGraphicsMagickWand2
 License:        MIT License (or similar)
 Summary:        Viewer and Converter for Images - runtime library
 Group:          Productivity/Graphics/Convertors
 
-%description -n libGraphicsMagickWand1
+%description -n libGraphicsMagickWand2
 GraphicsMagick(TM) provides a powerful image manipulation and
 translation utility. It is capable of displaying still images and
 animations using the X Window system, provides a simple interface for
@@ -180,12 +174,12 @@
 --------
     see the AUTHORS file
 
-%package -n libGraphicsMagick++2
+%package -n libGraphicsMagick++3
 License:        MIT License (or similar)
 Summary:        Viewer and Converter for Images - C++ interface
 Group:          System/Libraries
 
-%description -n libGraphicsMagick++2
+%description -n libGraphicsMagick++3
 GraphicsMagick(TM) provides a powerful image manipulation and
 translation utility. It is capable of displaying still images and
 animations using the X Window system, provides a simple interface for
@@ -211,7 +205,7 @@
 Group:          Development/Libraries/C and C++
 Provides:       GraphicsMagick-C++-devel 
 Obsoletes:      GraphicsMagick-C++-devel <= 1.1.7 
-Requires:       %{name} = %{version}, libGraphicsMagick++2 = %{version}
+Requires:       %{name} = %{version}, libGraphicsMagick++3 = %{version}
 Requires:       %{name}-devel = %{version}
 Requires:       c++_compiler
 
@@ -238,7 +232,6 @@
 %patch2 -p1
 %patch4
 %patch10
-%patch12
 
 %build
 # do not run autoreconf
@@ -286,17 +279,17 @@
 rm -f $RPM_BUILD_ROOT/var/adm/perl-modules/GraphicsMagick
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%post -n libGraphicsMagick2 -p /sbin/ldconfig
+%post -n libGraphicsMagick3 -p /sbin/ldconfig
 
-%postun -n libGraphicsMagick2 -p /sbin/ldconfig
+%postun -n libGraphicsMagick3 -p /sbin/ldconfig
 
-%post -n libGraphicsMagickWand1 -p /sbin/ldconfig
+%post -n libGraphicsMagickWand2 -p /sbin/ldconfig
 
-%postun -n libGraphicsMagickWand1 -p /sbin/ldconfig
+%postun -n libGraphicsMagickWand2 -p /sbin/ldconfig
 
-%post -n libGraphicsMagick++2 -p /sbin/ldconfig
+%post -n libGraphicsMagick++3 -p /sbin/ldconfig
 
-%postun -n libGraphicsMagick++2 -p /sbin/ldconfig
+%postun -n libGraphicsMagick++3 -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -312,7 +305,7 @@
 %doc %{_mandir}/man4/*gz
 %doc %{_mandir}/man5/*gz
 
-%files -n libGraphicsMagick2
+%files -n libGraphicsMagick3
 %defattr(644, root, root, 755)
 %{_libdir}/lib%{name}.so.*
 %dir %{_libdir}/%{name}-%{base_version}
@@ -326,7 +319,7 @@
 %dir %{_datadir}/%{name}-%{base_version}
 %{_datadir}/%{name}-%{base_version}/config
 
-%files -n libGraphicsMagickWand1
+%files -n libGraphicsMagickWand2
 %defattr(644, root, root, 755)
 %{_libdir}/lib%{name}Wand.so.*
 
@@ -356,7 +349,7 @@
 %{perl_vendorarch}/auto/Graphics/Magick/*
 %doc %{_mandir}/man3/*gz
 
-%files -n libGraphicsMagick++2
+%files -n libGraphicsMagick++3
 %defattr(644, root, root, 755)
 %{_libdir}/lib%{name}++.so.*
 

++++++ GraphicsMagick-1.2.7-debian-fixed.patch -> GraphicsMagick-1.3.7-debian-fixed.patch ++++++
--- GraphicsMagick/GraphicsMagick-1.2.7-debian-fixed.patch	2009-08-04 18:44:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick-1.3.7-debian-fixed.patch	2009-11-23 17:28:03.000000000 +0100
@@ -1,6 +1,8 @@
---- GraphicsMagick-1.1.8/magick/delegate.c
-+++ GraphicsMagick-1.1.8/magick/delegate.c
-@@ -389,7 +389,10 @@
+Index: GraphicsMagick-1.3.7/magick/delegate.c
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/delegate.c
++++ GraphicsMagick-1.3.7/magick/delegate.c
+@@ -454,7 +454,10 @@ MagickExport unsigned int InvokeDelegate
    char
      *command,
      **commands,
@@ -12,7 +14,7 @@
  
    const DelegateInfo
      *delegate_info;
-@@ -409,6 +412,10 @@
+@@ -474,6 +477,10 @@ MagickExport unsigned int InvokeDelegate
    assert(image != (Image *) NULL);
    assert(image->signature == MagickSignature);
    temporary_image_filename=(*image->filename == '\0');
@@ -23,7 +25,7 @@
    if (temporary_image_filename)
      {
        /* Allocate a temporary filename if image is unnamed.  */
-@@ -418,12 +425,24 @@
+@@ -483,12 +490,24 @@ MagickExport unsigned int InvokeDelegate
            return(False);
          }
      }
@@ -48,7 +50,7 @@
        (void) ThrowException(exception,DelegateError,NoTagFound,
          decode ? decode : encode);
        return(False);
-@@ -444,6 +463,18 @@
+@@ -509,6 +528,18 @@ MagickExport unsigned int InvokeDelegate
          }
        image_info->temporary=True;
      }
@@ -67,7 +69,7 @@
  
    if (delegate_info->mode != 0)
      if ((decode && (delegate_info->encode != (char *) NULL)) ||
-@@ -467,6 +498,13 @@
+@@ -532,6 +563,13 @@ MagickExport unsigned int InvokeDelegate
          {
            if (temporary_image_filename)
              (void) LiberateTemporaryFile(image->filename);
@@ -81,7 +83,7 @@
            (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image_info->unique);
            return(False);
          }
-@@ -475,6 +513,13 @@
+@@ -540,6 +578,13 @@ MagickExport unsigned int InvokeDelegate
          {
            if (temporary_image_filename)
              (void) LiberateTemporaryFile(image->filename);
@@ -95,7 +97,7 @@
            (void) LiberateTemporaryFile(image_info->unique);
            (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image_info->zero);
            return(False);
-@@ -488,6 +533,13 @@
+@@ -553,6 +598,13 @@ MagickExport unsigned int InvokeDelegate
              (void) LiberateTemporaryFile(image_info->zero);
              if (temporary_image_filename)
                (void) LiberateTemporaryFile(image->filename);
@@ -109,7 +111,7 @@
              (void) ThrowException(exception,DelegateError,DelegateFailed,
                decode ? decode : encode);
              return(False);
-@@ -513,6 +565,13 @@
+@@ -578,6 +630,13 @@ MagickExport unsigned int InvokeDelegate
                (void) LiberateTemporaryFile(image_info->zero);
                if (temporary_image_filename)
                  (void) LiberateTemporaryFile(image->filename);
@@ -123,7 +125,7 @@
                DestroyImageInfo(clone_info);
                (void) ThrowException(exception,DelegateError,DelegateFailed,
                  decode ? decode : encode);
-@@ -534,6 +593,13 @@
+@@ -599,6 +658,13 @@ MagickExport unsigned int InvokeDelegate
      {
        if (temporary_image_filename)
          (void) LiberateTemporaryFile(image->filename);
@@ -137,7 +139,7 @@
        (void) ThrowException(exception,ResourceLimitError,MemoryAllocationFailed,decode ? decode : encode);
        return(False);
      }
-@@ -668,6 +734,13 @@
+@@ -733,6 +799,13 @@ MagickExport unsigned int InvokeDelegate
   error_exit:
    if (temporary_image_filename)
      (void) LiberateTemporaryFile(image->filename);
@@ -151,9 +153,11 @@
    for ( ; commands[i] != (char *) NULL; i++)
      MagickFreeMemory(commands[i]);
    MagickFreeMemory(commands);
---- GraphicsMagick-1.1.8/magick/symbols.h
-+++ GraphicsMagick-1.1.8/magick/symbols.h
-@@ -30,6 +30,7 @@
+Index: GraphicsMagick-1.3.7/magick/symbols.h
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/symbols.h
++++ GraphicsMagick-1.3.7/magick/symbols.h
+@@ -29,6 +29,7 @@
  #define AcquireTemporaryFileDescriptor GmAcquireTemporaryFileDescriptor
  #define AcquireTemporaryFileName GmAcquireTemporaryFileName
  #define AcquireTemporaryFileStream GmAcquireTemporaryFileStream
@@ -161,9 +165,11 @@
  #define AdaptiveThresholdImage GmAdaptiveThresholdImage
  #define AddDefinitions GmAddDefinitions
  #define AddNoiseImage GmAddNoiseImage
---- GraphicsMagick-1.1.8/magick/tempfile.c
-+++ GraphicsMagick-1.1.8/magick/tempfile.c
-@@ -197,6 +197,93 @@
+Index: GraphicsMagick-1.3.7/magick/tempfile.c
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/tempfile.c
++++ GraphicsMagick-1.3.7/magick/tempfile.c
+@@ -192,6 +192,93 @@ MagickExport MagickPassFail AcquireTempo
  %                                                                             %
  %                                                                             %
  %                                                                             %
@@ -257,19 +263,23 @@
  +   A c q u i r e T e m p o r a r y F i l e D e s c r i p t o r               %
  %                                                                             %
  %                                                                             %
---- GraphicsMagick-1.1.8/magick/tempfile.h
-+++ GraphicsMagick-1.1.8/magick/tempfile.h
-@@ -26,6 +26,7 @@
+Index: GraphicsMagick-1.3.7/magick/tempfile.h
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/tempfile.h
++++ GraphicsMagick-1.3.7/magick/tempfile.h
+@@ -26,6 +26,7 @@ MagickExport void
  
- MagickExport unsigned int
+ MagickExport MagickPassFail
    AcquireTemporaryFileName(char *filename),
 +  AcquireTemporarySymlink(char *linkname, const char *name),
    LiberateTemporaryFile(char *filename);
  
  MagickExport int
---- GraphicsMagick-1.1.8/magick/utility.c
-+++ GraphicsMagick-1.1.8/magick/utility.c
-@@ -1134,6 +1134,72 @@
+Index: GraphicsMagick-1.3.7/magick/utility.c
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/utility.c
++++ GraphicsMagick-1.3.7/magick/utility.c
+@@ -1222,6 +1222,72 @@ MagickExport void FormatString(char *str
  %                                                                             %
  %                                                                             %
  %                                                                             %
@@ -342,9 +352,11 @@
  %   G e t E x e c u t i o n P a t h                                           %
  %                                                                             %
  %                                                                             %
---- GraphicsMagick-1.1.8/magick/utility.h
-+++ GraphicsMagick-1.1.8/magick/utility.h
-@@ -70,6 +70,7 @@
+Index: GraphicsMagick-1.3.7/magick/utility.h
+===================================================================
+--- GraphicsMagick-1.3.7.orig/magick/utility.h
++++ GraphicsMagick-1.3.7/magick/utility.h
+@@ -75,6 +75,7 @@ extern MagickExport char
    *AllocateString(const char *),
    *Base64Encode(const unsigned char *,const size_t,size_t *),
    *EscapeString(const char *,const char),

++++++ GraphicsMagick-1.2.7-include.patch -> GraphicsMagick-1.3.7-include.patch ++++++
--- GraphicsMagick/GraphicsMagick-1.2.7-include.patch	2009-10-05 11:59:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick-1.3.7-include.patch	2009-11-23 17:28:04.000000000 +0100
@@ -2,7 +2,7 @@
 ===================================================================
 --- Magick++/lib/Geometry.cpp.orig
 +++ Magick++/lib/Geometry.cpp
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
  
  #include "Magick++/Include.h"
  #include <string>

++++++ GraphicsMagick-1.2.7-perl.patch -> GraphicsMagick-1.3.7-perl.patch ++++++
--- GraphicsMagick/GraphicsMagick-1.2.7-perl.patch	2009-08-04 18:44:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick-1.3.7-perl.patch	2009-11-23 17:28:04.000000000 +0100
@@ -1,6 +1,8 @@
---- PerlMagick/Makefile.PL.in
+Index: PerlMagick/Makefile.PL.in
+===================================================================
+--- PerlMagick/Makefile.PL.in.orig
 +++ PerlMagick/Makefile.PL.in
-@@ -57,7 +57,7 @@
+@@ -67,7 +67,7 @@ WriteMakefile
     'INSTALLBIN'	=> '@BIN_DIR@',
  
     # Library specification

++++++ GraphicsMagick-1.2.7.tar.bz2 -> GraphicsMagick-1.3.7.tar.bz2 ++++++
GraphicsMagick/GraphicsMagick-1.2.7.tar.bz2 /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick-1.3.7.tar.bz2 differ: byte 11, line 1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit GraphicsMagick for openSUSE:Factory

root＠Hilbert.suse.de