Changeset 7092


Ignore:
Timestamp:
03/11/12 11:12:30 (15 months ago)
Author:
cristy
Message:
 
Location:
ImageMagick/branches/ImageMagick-6.7.6
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • ImageMagick/branches/ImageMagick-6.7.6/ImageMagick.spec

    r7063 r7092  
    11%global VERSION  6.7.6 
    2 %global Patchlevel  0 
    3  
    4 Name:           ImageMagick 
    5 Version:                %{VERSION}.%{Patchlevel} 
    6 Release:                3%{?dist} 
    7 Summary:                An X application for displaying and manipulating images 
    8 Group:          Applications/Multimedia 
    9 License:                ImageMagick 
    10 Url:                    http://www.imagemagick.org/ 
    11 Source0:                ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz 
    12  
    13 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
    14 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel 
    15 BuildRequires:  libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 
    16 BuildRequires:  ghostscript-devel, djvulibre-devel 
    17 BuildRequires:  libwmf-devel, jasper-devel, libtool-ltdl-devel 
    18 BuildRequires:  libX11-devel, libXext-devel, libXt-devel 
    19 BuildRequires:  lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel 
     2%global Patchlevel  1 
     3 
     4Name:           ImageMagick 
     5Version:        %{VERSION} 
     6Release:        %{Patchlevel} 
     7Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images. 
     8Group:          Applications/Multimedia 
     9License:        http://www.imagemagick.org/script/license.php 
     10Url:            http://www.imagemagick.org/ 
     11Source0:        http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 
     12 
     13BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
     14BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel 
     15BuildRequires:  libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 
     16BuildRequires:  ghostscript-devel, djvulibre-devel 
     17BuildRequires:  libwmf-devel, jasper-devel, libtool-ltdl-devel 
     18BuildRequires:  libX11-devel, libXext-devel, libXt-devel 
     19BuildRequires:  lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel 
    2020 
    2121%description 
    22 ImageMagick is an image display and manipulation tool for the X 
    23 Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, 
    24 and Photo CD image formats. It can resize, rotate, sharpen, color 
    25 reduce, or add special effects to an image, and when finished you can 
    26 either save the completed work in the original format or a different 
    27 one. ImageMagick also includes command line programs for creating 
    28 animated or transparent .gifs, creating composite images, creating 
    29 thumbnail images, and more. 
    30  
    31 ImageMagick is one of your choices if you need a program to manipulate 
    32 and display images. If you want to develop your own applications 
    33 which use ImageMagick code or APIs, you need to install 
    34 ImageMagick-devel as well. 
     22ImageMagick is a software suite to create, edit, and compose bitmap images. It 
     23can read, convert and write images in a variety of formats (about 100) 
     24including DPX, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, 
     25and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear 
     26and transform images, adjust image colors, apply various special effects, 
     27or draw text, lines, polygons, ellipses and Bézier curves. 
     28 
     29The functionality of ImageMagick is typically utilized from the command line 
     30or you can use the features from programs written in your favorite programming 
     31language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand 
     32(C), ChMagick (Ch), Magick++ (C++), JMagick (Java), L-Magick (Lisp), nMagick 
     33(Neko/haXe), PascalMagick (Pascal), PerlMagick (Perl), MagickWand for PHP 
     34(PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a 
     35language interface, use ImageMagick to modify or create images automagically 
     36and dynamically. 
     37 
     38ImageMagick is free software delivered as a ready-to-run binary distribution 
     39or as source code that you may freely use, copy, modify, and distribute in 
     40both open and proprietary applications. It is distributed under an Apache 
     412.0-style license, approved by the OSI. 
     42 
     43The ImageMagick development process ensures a stable API and ABI. Before 
     44each ImageMagick release, we perform a comprehensive security assessment that 
     45includes memory and thread error detection to help prevent exploits.ImageMagick 
     46is free software delivered as a ready-to-run binary distribution or as source 
     47code that you may freely use, copy, modify, and distribute in both open and 
     48proprietary applications. It is distributed under an Apache 2.0-style license, 
     49approved by the OSI. 
    3550 
    3651 
    3752%package devel 
    38 Summary: Library links and header files for ImageMagick app development 
     53Summary: Library links and header files for ImageMagick application development 
    3954Group: Development/Libraries 
    4055Requires: %{name} = %{version}-%{release} 
    … …  
    6075 
    6176 
     77%package doc 
     78Summary: ImageMagick HTML documentation 
     79Group: Documentation 
     80 
     81 
    6282%package djvu 
    6383Summary: DjVu plugin for ImageMagick 
    … …  
    7090 
    7191 
    72 %package doc 
    73 Summary: ImageMagick html documentation 
    74 Group: Documentation 
    75  
    7692%description doc 
    7793ImageMagick documentation, this package contains usage (for the 
    78 commandline tools) and API (for the libraries) documentation in html format. 
     94commandline tools) and API (for the libraries) documentation in HTML format. 
    7995Note this documentation can also be found on the ImageMagick website: 
    80 http://www.imagemagick.org/ 
     96http://www.imagemagick.org/. 
    8197 
    8298 
    … …  
    87103Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) 
    88104 
     105 
    89106%description perl 
    90107Perl bindings to ImageMagick. 
    … …  
    120137or APIs, you'll need to install ImageMagick-c++-devel, ImageMagick-devel and 
    121138ImageMagick. 
     139 
    122140You don't need to install it if you just want to use ImageMagick, or if you 
    123141want to develop/compile applications using the ImageMagick C interface, 
    … …  
    131149touch -r README.txt README.txt.tmp 
    132150mv README.txt.tmp README.txt 
    133 # for %doc 
     151# for %%doc 
    134152mkdir Magick++/examples 
    135153cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples 
    136  
    137154 
    138155%build 
    … …  
    149166           --with-rsvg \ 
    150167           --with-xml \ 
    151            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ 
     168           --with-perl-options='INSTALLDIRS=vendor' \ 
    152169           --without-dps \ 
    153170           --without-included-ltdl --with-ltdl-include=%{_includedir} \ 
    … …  
    161178 
    162179%install 
    163 rm -rf %{buildroot} 
    164  
    165 make install DESTDIR=%{buildroot} INSTALL="install -p" 
    166 cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} 
    167 # Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! 
    168 rm %{buildroot}%{_libdir}/*.la 
     180rm -rf $RPM_BUILD_ROOT 
     181 
     182make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" 
     183cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name} 
     184rm $RPM_BUILD_ROOT%{_libdir}/*.la 
    169185 
    170186# fix weird perl Magick.so permissions 
    171 chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so 
     187chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so 
    172188 
    173189# perlmagick: fix perl path of demo files 
    … …  
    175191 
    176192# perlmagick: cleanup various perl tempfiles from the build which get installed 
    177 find %{buildroot} -name "*.bs" |xargs rm -f 
    178 find %{buildroot} -name ".packlist" |xargs rm -f 
    179 find %{buildroot} -name "perllocal.pod" |xargs rm -f 
     193find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f 
     194find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f 
     195find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f 
    180196 
    181197# perlmagick: build files list 
    182198echo "%defattr(-,root,root,-)" > perl-pkg-files 
    183 find %{buildroot}/%{_libdir}/perl* -type f -print \ 
    184         | sed "s@^%{buildroot}@@g" > perl-pkg-files  
    185 find %{buildroot}%{perl_vendorarch} -type d -print \ 
    186         | sed "s@^%{buildroot}@%dir @g" \ 
     199find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ 
     200        | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files  
     201find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ 
     202        | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ 
    187203        | grep -v '^%dir %{perl_vendorarch}$' \ 
    188204        | grep -v '/auto$' >> perl-pkg-files  
    … …  
    199215%endif 
    200216 
    201 mv %{buildroot}%{_includedir}/%{name}/magick/magick-config.h \ 
    202    %{buildroot}%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
    203  
    204 cat >%{buildroot}%{_includedir}/%{name}/magick/magick-config.h <<EOF 
     217mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ 
     218   $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
     219 
     220cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <<EOF 
    205221#ifndef IMAGEMAGICK_MULTILIB 
    206222#define IMAGEMAGICK_MULTILIB 
    … …  
    219235EOF 
    220236 
    221 # Fonts must be packaged separately. It does nothave matter and demos work without it. 
    222 rm PerlMagick/demo/Generic.ttf 
    223  
    224 # From version around 6.7.5-6 docs go to unversioned dir. Fixing 
    225 mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}/%{_datadir}/doc/%{name}-%{VERSION} 
    226  
    227237%clean 
    228 rm -rf %{buildroot} 
     238rm -rf $RPM_BUILD_ROOT 
    229239 
    230240 
    … …  
    242252%doc QuickStart.txt ChangeLog Platforms.txt 
    243253%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt 
    244 %{_libdir}/libMagickCore.so.5* 
    245 %{_libdir}/libMagickWand.so.5* 
     254%{_libdir}/libMagickCore.so* 
     255%{_libdir}/libMagickWand.so* 
     256%{_libdir}/%{name}-%{VERSION} 
    246257%{_bindir}/[a-z]* 
     258%{_sysconfdir}/%{name} 
    247259%{_libdir}/%{name}-%{VERSION} 
    248260%{_datadir}/%{name}-%{VERSION} 
    249 %{_mandir}/man[145]/[a-z]* 
     261%{_mandir}/man[145]/[a-zA-Z]* 
    250262%{_mandir}/man1/%{name}.* 
    251263%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
    252 %{_sysconfdir}/%{name} 
     264 
    253265 
    254266%files devel 
    … …  
    258270%{_bindir}/MagickWand-config 
    259271%{_bindir}/Wand-config 
    260 %{_libdir}/libMagickCore.so 
    261 %{_libdir}/libMagickWand.so 
     272%{_libdir}/libMagickCore.so* 
     273%{_libdir}/libMagickWand.so* 
    262274%{_libdir}/pkgconfig/MagickCore.pc 
    263275%{_libdir}/pkgconfig/ImageMagick.pc 
    … …  
    274286%files djvu 
    275287%defattr(-,root,root,-) 
    276 %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
     288%{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.* 
    277289 
    278290%files doc 
    279291%defattr(-,root,root,-) 
    280 %doc %{_datadir}/doc/%{name}-%{VERSION} 
     292%doc %{_datadir}/doc/%{name} 
    281293%doc LICENSE 
    282294 
    … …  
    285297%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README 
    286298%doc www/Magick++/COPYING 
    287 %{_libdir}/libMagick++.so.5* 
     299%{_libdir}/libMagick++.so* 
    288300 
    289301%files c++-devel 
    … …  
    293305%{_includedir}/%{name}/Magick++ 
    294306%{_includedir}/%{name}/Magick++.h 
    295 %{_libdir}/libMagick++.so 
     307%{_libdir}/libMagick++.so* 
    296308%{_libdir}/pkgconfig/Magick++.pc 
    297309%{_libdir}/pkgconfig/ImageMagick++.pc 
    … …  
    303315%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt 
    304316 
     317 
    305318%changelog 
    306319* Sun May 01 2005 Cristy <cristy@mystic.es.dupont.com> 1.0-0 

  • ImageMagick/branches/ImageMagick-6.7.6/config/ImageMagick.rdf

    r7059 r7092  
    66    <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc> 
    77    <homepage rdf:resource="http://www.imagemagick.org/"/> 
    8     <created>2012-03-05</created> 
     8    <created>2012-03-11</created> 
    99 
    1010    <description xml:lang="en"> 
    … …  
    5858      <Version> 
    5959          <name>stable</name> 
    60           <created>2012-03-05</created> 
     60          <created>2012-03-11</created> 
    6161          <revision>6.7.6</revision> 
    6262      </Version> 

  • ImageMagick/branches/ImageMagick-6.7.6/config/configure.xml

    r7059 r7092  
    1010  <configure name="VERSION" value="6.7.6"/> 
    1111  <configure name="LIB_VERSION" value="0x676"/> 
    12   <configure name="LIB_VERSION_NUMBER" value="6,7,6,0"/> 
    13   <configure name="SVN_REVISION" value="7058" /> 
    14   <configure name="RELEASE_DATE" value="2012-03-05"/> 
     12  <configure name="LIB_VERSION_NUMBER" value="6,7,6,1"/> 
     13  <configure name="SVN_REVISION" value="7083" /> 
     14  <configure name="RELEASE_DATE" value="2012-03-11"/> 
    1515  <configure name="CONFIGURE" value="./configure "/> 
    1616  <configure name="PREFIX" value="/usr/local"/> 

  • ImageMagick/branches/ImageMagick-6.7.6/configure

    r7059 r7092  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.68 for ImageMagick 6.7.6-0. 
     3# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.6-1. 
    44# 
    55# Report bugs to <http://www.imagemagick.org>. 
    … …  
    575575PACKAGE_NAME='ImageMagick' 
    576576PACKAGE_TARNAME='ImageMagick' 
    577 PACKAGE_VERSION='6.7.6-0' 
    578 PACKAGE_STRING='ImageMagick 6.7.6-0' 
     577PACKAGE_VERSION='6.7.6-1' 
     578PACKAGE_STRING='ImageMagick 6.7.6-1' 
    579579PACKAGE_BUGREPORT='http://www.imagemagick.org' 
    580580PACKAGE_URL='' 
    … …  
    17411741  # This message is too long to be a string in the A/UX 3.1 sh. 
    17421742  cat <<_ACEOF 
    1743 \`configure' configures ImageMagick 6.7.6-0 to adapt to many kinds of systems. 
     1743\`configure' configures ImageMagick 6.7.6-1 to adapt to many kinds of systems. 
    17441744 
    17451745Usage: $0 [OPTION]... [VAR=VALUE]... 
    … …  
    18161816if test -n "$ac_init_help"; then 
    18171817  case $ac_init_help in 
    1818      short | recursive ) echo "Configuration of ImageMagick 6.7.6-0:";; 
     1818     short | recursive ) echo "Configuration of ImageMagick 6.7.6-1:";; 
    18191819   esac 
    18201820  cat <<\_ACEOF 
    … …  
    20352035if $ac_init_version; then 
    20362036  cat <<\_ACEOF 
    2037 ImageMagick configure 6.7.6-0 
     2037ImageMagick configure 6.7.6-1 
    20382038generated by GNU Autoconf 2.68 
    20392039 
    … …  
    30783078running configure, to aid debugging if configure makes a mistake. 
    30793079 
    3080 It was created by ImageMagick $as_me 6.7.6-0, which was 
     3080It was created by ImageMagick $as_me 6.7.6-1, which was 
    30813081generated by GNU Autoconf 2.68.  Invocation command line was 
    30823082 
    … …  
    36173617MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE 
    36183618 
    3619 MAGICK_SVN_REVISION=7058 
     3619MAGICK_SVN_REVISION=7083 
    36203620 
    36213621 
    … …  
    41014101# Define the identity of the package. 
    41024102 PACKAGE='ImageMagick' 
    4103  VERSION='6.7.6-0' 
     4103 VERSION='6.7.6-1' 
    41044104 
    41054105 
    … …  
    3648136481# values after options handling. 
    3648236482ac_log=" 
    36483 This file was extended by ImageMagick $as_me 6.7.6-0, which was 
     36483This file was extended by ImageMagick $as_me 6.7.6-1, which was 
    3648436484generated by GNU Autoconf 2.68.  Invocation command line was 
    3648536485 
    … …  
    3654736547ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
    3654836548ac_cs_version="\\ 
    36549 ImageMagick config.status 6.7.6-0 
     36549ImageMagick config.status 6.7.6-1 
    3655036550configured by $0, generated by GNU Autoconf 2.68, 
    3655136551  with options \\"\$ac_cs_config\\" 

  • ImageMagick/branches/ImageMagick-6.7.6/configure.ac

    r7059 r7092  
    2020m4_define([magick_minor_version], [7]) 
    2121m4_define([magick_micro_version], [6]) 
    22 m4_define([magick_patchlevel_version], [0]) 
     22m4_define([magick_patchlevel_version], [1]) 
    2323m4_define([magick_version], 
    2424          [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version]) 

  • ImageMagick/branches/ImageMagick-6.7.6/libtool

    r7059 r7092  
    22 
    33# libtool - Provide generalized library-building support services. 
    4 # Generated automatically by config.status (ImageMagick) 6.7.6-0 
     4# Generated automatically by config.status (ImageMagick) 6.7.6-1 
    55# Libtool was configured on host magick.imagemagick.org: 
    66# NOTE: Changes made to this file will be lost: look at ltmain.sh. 

  • ImageMagick/branches/ImageMagick-6.7.6/magick/magick-config.h

    r7059 r7092  
    13031303/* Define to the full name and version of this package. */ 
    13041304#ifndef MAGICKCORE_PACKAGE_STRING 
    1305 #define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.6-0" 
     1305#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.6-1" 
    13061306#endif 
    13071307 
    … …  
    13181318/* Define to the version of this package. */ 
    13191319#ifndef MAGICKCORE_PACKAGE_VERSION 
    1320 #define MAGICKCORE_PACKAGE_VERSION "6.7.6-0" 
     1320#define MAGICKCORE_PACKAGE_VERSION "6.7.6-1" 
    13211321#endif 
    13221322 
    … …  
    15081508/* Version number of package */ 
    15091509#ifndef MAGICKCORE_VERSION 
    1510 #define MAGICKCORE_VERSION "6.7.6-0" 
     1510#define MAGICKCORE_VERSION "6.7.6-1" 
    15111511#endif 
    15121512 

  • ImageMagick/branches/ImageMagick-6.7.6/magick/version.h

    r7059 r7092  
    2828#define MagickPackageName "ImageMagick" 
    2929#define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC" 
    30 #define MagickSVNRevision  "7058" 
     30#define MagickSVNRevision  "7083" 
    3131#define MagickLibVersion  0x676 
    3232#define MagickLibVersionText  "6.7.6" 
    3333#define MagickLibVersionNumber  5,0,0 
    34 #define MagickLibAddendum  "-0" 
     34#define MagickLibAddendum  "-1" 
    3535#define MagickLibInterface  5 
    3636#define MagickLibMinInterface  5 
    37 #define MagickReleaseDate  "2012-03-05" 
    38 #define MagickChangeDate   "20120305" 
     37#define MagickReleaseDate  "2012-03-11" 
     38#define MagickChangeDate   "20120310" 
    3939#define MagickAuthoritativeURL  "http://www.imagemagick.org" 
    4040#if defined(MAGICKCORE_OPENMP_SUPPORT) 

  • ImageMagick/branches/ImageMagick-6.7.6/version.sh

    r7059 r7092  
    1414PACKAGE_PERL_VERSION='6.76' 
    1515PACKAGE_LIB_VERSION="0x676" 
    16 PACKAGE_RELEASE="0" 
     16PACKAGE_RELEASE="1" 
    1717PACKAGE_LIB_VERSION_NUMBER="6,7,6,${PACKAGE_RELEASE}" 
    1818PACKAGE_RELEASE_DATE=`date +%F` 
Note: See TracChangeset for help on using the changeset viewer.