Changeset 7063


Ignore:
Timestamp:
03/05/12 20:15:16 (16 months ago)
Author:
cristy
Message:
 
Location:
ImageMagick/branches/ImageMagick-6.7.6
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r7059 r7063  
    22%global Patchlevel  0 
    33 
    4 Name:           ImageMagick 
    5 Version:        %{VERSION} 
    6 Release:        %{Patchlevel} 
    7 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images. 
    8 Group:          Applications/Multimedia 
    9 License:        http://www.imagemagick.org/script/license.php 
    10 Url:            http://www.imagemagick.org/ 
    11 Source0:        http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 
    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 
     4Name:           ImageMagick 
     5Version:                %{VERSION}.%{Patchlevel} 
     6Release:                3%{?dist} 
     7Summary:                An X application for displaying and manipulating images 
     8Group:          Applications/Multimedia 
     9License:                ImageMagick 
     10Url:                    http://www.imagemagick.org/ 
     11Source0:                ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz 
     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 a software suite to create, edit, and compose bitmap images. It 
    23 can read, convert and write images in a variety of formats (about 100) 
    24 including DPX, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, 
    25 and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear 
    26 and transform images, adjust image colors, apply various special effects, 
    27 or draw text, lines, polygons, ellipses and Bézier curves. 
    28  
    29 The functionality of ImageMagick is typically utilized from the command line 
    30 or you can use the features from programs written in your favorite programming 
    31 language. 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 
    35 language interface, use ImageMagick to modify or create images automagically 
    36 and dynamically. 
    37  
    38 ImageMagick is free software delivered as a ready-to-run binary distribution 
    39 or as source code that you may freely use, copy, modify, and distribute in 
    40 both open and proprietary applications. It is distributed under an Apache 
    41 2.0-style license, approved by the OSI. 
    42  
    43 The ImageMagick development process ensures a stable API and ABI. Before 
    44 each ImageMagick release, we perform a comprehensive security assessment that 
    45 includes memory and thread error detection to help prevent exploits.ImageMagick 
    46 is free software delivered as a ready-to-run binary distribution or as source 
    47 code that you may freely use, copy, modify, and distribute in both open and 
    48 proprietary applications. It is distributed under an Apache 2.0-style license, 
    49 approved by the OSI. 
     22ImageMagick is an image display and manipulation tool for the X 
     23Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, 
     24and Photo CD image formats. It can resize, rotate, sharpen, color 
     25reduce, or add special effects to an image, and when finished you can 
     26either save the completed work in the original format or a different 
     27one. ImageMagick also includes command line programs for creating 
     28animated or transparent .gifs, creating composite images, creating 
     29thumbnail images, and more. 
     30 
     31ImageMagick is one of your choices if you need a program to manipulate 
     32and display images. If you want to develop your own applications 
     33which use ImageMagick code or APIs, you need to install 
     34ImageMagick-devel as well. 
    5035 
    5136 
    5237%package devel 
    53 Summary: Library links and header files for ImageMagick application development 
     38Summary: Library links and header files for ImageMagick app development 
    5439Group: Development/Libraries 
    5540Requires: %{name} = %{version}-%{release} 
    … …  
    7560 
    7661 
    77 %package doc 
    78 Summary: ImageMagick HTML documentation 
    79 Group: Documentation 
    80  
    81  
    8262%package djvu 
    8363Summary: DjVu plugin for ImageMagick 
    … …  
    9070 
    9171 
     72%package doc 
     73Summary: ImageMagick html documentation 
     74Group: Documentation 
     75 
    9276%description doc 
    9377ImageMagick documentation, this package contains usage (for the 
    94 commandline tools) and API (for the libraries) documentation in HTML format. 
     78commandline tools) and API (for the libraries) documentation in html format. 
    9579Note this documentation can also be found on the ImageMagick website: 
    96 http://www.imagemagick.org/. 
     80http://www.imagemagick.org/ 
    9781 
    9882 
    … …  
    10387Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) 
    10488 
    105  
    10689%description perl 
    10790Perl bindings to ImageMagick. 
    … …  
    137120or APIs, you'll need to install ImageMagick-c++-devel, ImageMagick-devel and 
    138121ImageMagick. 
    139  
    140122You don't need to install it if you just want to use ImageMagick, or if you 
    141123want to develop/compile applications using the ImageMagick C interface, 
    … …  
    149131touch -r README.txt README.txt.tmp 
    150132mv README.txt.tmp README.txt 
    151 # for %%doc 
     133# for %doc 
    152134mkdir Magick++/examples 
    153135cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples 
     136 
    154137 
    155138%build 
    … …  
    166149           --with-rsvg \ 
    167150           --with-xml \ 
    168            --with-perl-options='INSTALLDIRS=vendor' \ 
     151           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ 
    169152           --without-dps \ 
    170153           --without-included-ltdl --with-ltdl-include=%{_includedir} \ 
    … …  
    178161 
    179162%install 
    180 rm -rf $RPM_BUILD_ROOT 
    181  
    182 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" 
    183 cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name} 
    184 rm $RPM_BUILD_ROOT%{_libdir}/*.la 
     163rm -rf %{buildroot} 
     164 
     165make install DESTDIR=%{buildroot} INSTALL="install -p" 
     166cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} 
     167# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! 
     168rm %{buildroot}%{_libdir}/*.la 
    185169 
    186170# fix weird perl Magick.so permissions 
    187 chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so 
     171chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so 
    188172 
    189173# perlmagick: fix perl path of demo files 
    … …  
    191175 
    192176# perlmagick: cleanup various perl tempfiles from the build which get installed 
    193 find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f 
    194 find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f 
    195 find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f 
     177find %{buildroot} -name "*.bs" |xargs rm -f 
     178find %{buildroot} -name ".packlist" |xargs rm -f 
     179find %{buildroot} -name "perllocal.pod" |xargs rm -f 
    196180 
    197181# perlmagick: build files list 
    198182echo "%defattr(-,root,root,-)" > perl-pkg-files 
    199 find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ 
    200         | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files  
    201 find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ 
    202         | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ 
     183find %{buildroot}/%{_libdir}/perl* -type f -print \ 
     184        | sed "s@^%{buildroot}@@g" > perl-pkg-files  
     185find %{buildroot}%{perl_vendorarch} -type d -print \ 
     186        | sed "s@^%{buildroot}@%dir @g" \ 
    203187        | grep -v '^%dir %{perl_vendorarch}$' \ 
    204188        | grep -v '/auto$' >> perl-pkg-files  
    … …  
    215199%endif 
    216200 
    217 mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ 
    218    $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
    219  
    220 cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <<EOF 
     201mv %{buildroot}%{_includedir}/%{name}/magick/magick-config.h \ 
     202   %{buildroot}%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
     203 
     204cat >%{buildroot}%{_includedir}/%{name}/magick/magick-config.h <<EOF 
    221205#ifndef IMAGEMAGICK_MULTILIB 
    222206#define IMAGEMAGICK_MULTILIB 
    … …  
    235219EOF 
    236220 
     221# Fonts must be packaged separately. It does nothave matter and demos work without it. 
     222rm PerlMagick/demo/Generic.ttf 
     223 
     224# From version around 6.7.5-6 docs go to unversioned dir. Fixing 
     225mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}/%{_datadir}/doc/%{name}-%{VERSION} 
     226 
    237227%clean 
    238 rm -rf $RPM_BUILD_ROOT 
     228rm -rf %{buildroot} 
    239229 
    240230 
    … …  
    252242%doc QuickStart.txt ChangeLog Platforms.txt 
    253243%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt 
    254 %{_libdir}/libMagickCore.so* 
    255 %{_libdir}/libMagickWand.so* 
    256 %{_libdir}/%{name}-%{VERSION} 
     244%{_libdir}/libMagickCore.so.5* 
     245%{_libdir}/libMagickWand.so.5* 
    257246%{_bindir}/[a-z]* 
    258 %{_sysconfdir}/%{name} 
    259247%{_libdir}/%{name}-%{VERSION} 
    260248%{_datadir}/%{name}-%{VERSION} 
    261 %{_mandir}/man[145]/[a-zA-Z]* 
     249%{_mandir}/man[145]/[a-z]* 
    262250%{_mandir}/man1/%{name}.* 
    263251%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
    264  
     252%{_sysconfdir}/%{name} 
    265253 
    266254%files devel 
    … …  
    270258%{_bindir}/MagickWand-config 
    271259%{_bindir}/Wand-config 
    272 %{_libdir}/libMagickCore.so* 
    273 %{_libdir}/libMagickWand.so* 
     260%{_libdir}/libMagickCore.so 
     261%{_libdir}/libMagickWand.so 
    274262%{_libdir}/pkgconfig/MagickCore.pc 
    275263%{_libdir}/pkgconfig/ImageMagick.pc 
    … …  
    286274%files djvu 
    287275%defattr(-,root,root,-) 
    288 %{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.* 
     276%{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
    289277 
    290278%files doc 
    291279%defattr(-,root,root,-) 
    292 %doc %{_datadir}/doc/%{name} 
     280%doc %{_datadir}/doc/%{name}-%{VERSION} 
    293281%doc LICENSE 
    294282 
    … …  
    297285%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README 
    298286%doc www/Magick++/COPYING 
    299 %{_libdir}/libMagick++.so* 
     287%{_libdir}/libMagick++.so.5* 
    300288 
    301289%files c++-devel 
    … …  
    305293%{_includedir}/%{name}/Magick++ 
    306294%{_includedir}/%{name}/Magick++.h 
    307 %{_libdir}/libMagick++.so* 
     295%{_libdir}/libMagick++.so 
    308296%{_libdir}/pkgconfig/Magick++.pc 
    309297%{_libdir}/pkgconfig/ImageMagick++.pc 
    … …  
    315303%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt 
    316304 
    317  
    318305%changelog 
    319306* Sun May 01 2005 Cristy <cristy@mystic.es.dupont.com> 1.0-0 

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

    r6017 r7063  
    22%global Patchlevel  @PACKAGE_RELEASE@ 
    33 
    4 Name:           @PACKAGE_NAME@ 
    5 Version:        %{VERSION} 
    6 Release:        %{Patchlevel} 
    7 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images. 
    8 Group:          Applications/Multimedia 
    9 License:        http://www.imagemagick.org/script/license.php 
    10 Url:            http://www.imagemagick.org/ 
    11 Source0:        http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 
    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 
     4Name:           ImageMagick 
     5Version:                %{VERSION}.%{Patchlevel} 
     6Release:                3%{?dist} 
     7Summary:                An X application for displaying and manipulating images 
     8Group:          Applications/Multimedia 
     9License:                ImageMagick 
     10Url:                    http://www.imagemagick.org/ 
     11Source0:                ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz 
     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 a software suite to create, edit, and compose bitmap images. It 
    23 can read, convert and write images in a variety of formats (about 100) 
    24 including DPX, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, 
    25 and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear 
    26 and transform images, adjust image colors, apply various special effects, 
    27 or draw text, lines, polygons, ellipses and Bézier curves. 
    28  
    29 The functionality of ImageMagick is typically utilized from the command line 
    30 or you can use the features from programs written in your favorite programming 
    31 language. 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 
    35 language interface, use ImageMagick to modify or create images automagically 
    36 and dynamically. 
    37  
    38 ImageMagick is free software delivered as a ready-to-run binary distribution 
    39 or as source code that you may freely use, copy, modify, and distribute in 
    40 both open and proprietary applications. It is distributed under an Apache 
    41 2.0-style license, approved by the OSI. 
    42  
    43 The ImageMagick development process ensures a stable API and ABI. Before 
    44 each ImageMagick release, we perform a comprehensive security assessment that 
    45 includes memory and thread error detection to help prevent exploits.ImageMagick 
    46 is free software delivered as a ready-to-run binary distribution or as source 
    47 code that you may freely use, copy, modify, and distribute in both open and 
    48 proprietary applications. It is distributed under an Apache 2.0-style license, 
    49 approved by the OSI. 
     22ImageMagick is an image display and manipulation tool for the X 
     23Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, 
     24and Photo CD image formats. It can resize, rotate, sharpen, color 
     25reduce, or add special effects to an image, and when finished you can 
     26either save the completed work in the original format or a different 
     27one. ImageMagick also includes command line programs for creating 
     28animated or transparent .gifs, creating composite images, creating 
     29thumbnail images, and more. 
     30 
     31ImageMagick is one of your choices if you need a program to manipulate 
     32and display images. If you want to develop your own applications 
     33which use ImageMagick code or APIs, you need to install 
     34ImageMagick-devel as well. 
    5035 
    5136 
    5237%package devel 
    53 Summary: Library links and header files for ImageMagick application development 
     38Summary: Library links and header files for ImageMagick app development 
    5439Group: Development/Libraries 
    5540Requires: %{name} = %{version}-%{release} 
    … …  
    7560 
    7661 
    77 %package doc 
    78 Summary: ImageMagick HTML documentation 
    79 Group: Documentation 
    80  
    81  
    8262%package djvu 
    8363Summary: DjVu plugin for ImageMagick 
    … …  
    9070 
    9171 
     72%package doc 
     73Summary: ImageMagick html documentation 
     74Group: Documentation 
     75 
    9276%description doc 
    9377ImageMagick documentation, this package contains usage (for the 
    94 commandline tools) and API (for the libraries) documentation in HTML format. 
     78commandline tools) and API (for the libraries) documentation in html format. 
    9579Note this documentation can also be found on the ImageMagick website: 
    96 http://www.imagemagick.org/. 
     80http://www.imagemagick.org/ 
    9781 
    9882 
    … …  
    10387Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) 
    10488 
    105  
    10689%description perl 
    10790Perl bindings to ImageMagick. 
    … …  
    137120or APIs, you'll need to install ImageMagick-c++-devel, ImageMagick-devel and 
    138121ImageMagick. 
    139  
    140122You don't need to install it if you just want to use ImageMagick, or if you 
    141123want to develop/compile applications using the ImageMagick C interface, 
    … …  
    149131touch -r README.txt README.txt.tmp 
    150132mv README.txt.tmp README.txt 
    151 # for %%doc 
     133# for %doc 
    152134mkdir Magick++/examples 
    153135cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples 
     136 
    154137 
    155138%build 
    … …  
    166149           --with-rsvg \ 
    167150           --with-xml \ 
    168            --with-perl-options='INSTALLDIRS=vendor' \ 
     151           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ 
    169152           --without-dps \ 
    170153           --without-included-ltdl --with-ltdl-include=%{_includedir} \ 
    … …  
    178161 
    179162%install 
    180 rm -rf $RPM_BUILD_ROOT 
    181  
    182 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" 
    183 cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name} 
    184 rm $RPM_BUILD_ROOT%{_libdir}/*.la 
     163rm -rf %{buildroot} 
     164 
     165make install DESTDIR=%{buildroot} INSTALL="install -p" 
     166cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} 
     167# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! 
     168rm %{buildroot}%{_libdir}/*.la 
    185169 
    186170# fix weird perl Magick.so permissions 
    187 chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so 
     171chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so 
    188172 
    189173# perlmagick: fix perl path of demo files 
    … …  
    191175 
    192176# perlmagick: cleanup various perl tempfiles from the build which get installed 
    193 find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f 
    194 find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f 
    195 find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f 
     177find %{buildroot} -name "*.bs" |xargs rm -f 
     178find %{buildroot} -name ".packlist" |xargs rm -f 
     179find %{buildroot} -name "perllocal.pod" |xargs rm -f 
    196180 
    197181# perlmagick: build files list 
    198182echo "%defattr(-,root,root,-)" > perl-pkg-files 
    199 find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ 
    200         | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files  
    201 find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ 
    202         | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ 
     183find %{buildroot}/%{_libdir}/perl* -type f -print \ 
     184        | sed "s@^%{buildroot}@@g" > perl-pkg-files  
     185find %{buildroot}%{perl_vendorarch} -type d -print \ 
     186        | sed "s@^%{buildroot}@%dir @g" \ 
    203187        | grep -v '^%dir %{perl_vendorarch}$' \ 
    204188        | grep -v '/auto$' >> perl-pkg-files  
    … …  
    215199%endif 
    216200 
    217 mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ 
    218    $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
    219  
    220 cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <<EOF 
     201mv %{buildroot}%{_includedir}/%{name}/magick/magick-config.h \ 
     202   %{buildroot}%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h 
     203 
     204cat >%{buildroot}%{_includedir}/%{name}/magick/magick-config.h <<EOF 
    221205#ifndef IMAGEMAGICK_MULTILIB 
    222206#define IMAGEMAGICK_MULTILIB 
    … …  
    235219EOF 
    236220 
     221# Fonts must be packaged separately. It does nothave matter and demos work without it. 
     222rm PerlMagick/demo/Generic.ttf 
     223 
     224# From version around 6.7.5-6 docs go to unversioned dir. Fixing 
     225mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}/%{_datadir}/doc/%{name}-%{VERSION} 
     226 
    237227%clean 
    238 rm -rf $RPM_BUILD_ROOT 
     228rm -rf %{buildroot} 
    239229 
    240230 
    … …  
    252242%doc QuickStart.txt ChangeLog Platforms.txt 
    253243%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt 
    254 %{_libdir}/libMagickCore.so* 
    255 %{_libdir}/libMagickWand.so* 
    256 %{_libdir}/%{name}-%{VERSION} 
     244%{_libdir}/libMagickCore.so.5* 
     245%{_libdir}/libMagickWand.so.5* 
    257246%{_bindir}/[a-z]* 
    258 %{_sysconfdir}/%{name} 
    259247%{_libdir}/%{name}-%{VERSION} 
    260248%{_datadir}/%{name}-%{VERSION} 
    261 %{_mandir}/man[145]/[a-zA-Z]* 
     249%{_mandir}/man[145]/[a-z]* 
    262250%{_mandir}/man1/%{name}.* 
    263251%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
    264  
     252%{_sysconfdir}/%{name} 
    265253 
    266254%files devel 
    … …  
    270258%{_bindir}/MagickWand-config 
    271259%{_bindir}/Wand-config 
    272 %{_libdir}/libMagickCore.so* 
    273 %{_libdir}/libMagickWand.so* 
     260%{_libdir}/libMagickCore.so 
     261%{_libdir}/libMagickWand.so 
    274262%{_libdir}/pkgconfig/MagickCore.pc 
    275263%{_libdir}/pkgconfig/ImageMagick.pc 
    … …  
    286274%files djvu 
    287275%defattr(-,root,root,-) 
    288 %{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.* 
     276%{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* 
    289277 
    290278%files doc 
    291279%defattr(-,root,root,-) 
    292 %doc %{_datadir}/doc/%{name} 
     280%doc %{_datadir}/doc/%{name}-%{VERSION} 
    293281%doc LICENSE 
    294282 
    … …  
    297285%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README 
    298286%doc www/Magick++/COPYING 
    299 %{_libdir}/libMagick++.so* 
     287%{_libdir}/libMagick++.so.5* 
    300288 
    301289%files c++-devel 
    … …  
    305293%{_includedir}/%{name}/Magick++ 
    306294%{_includedir}/%{name}/Magick++.h 
    307 %{_libdir}/libMagick++.so* 
     295%{_libdir}/libMagick++.so 
    308296%{_libdir}/pkgconfig/Magick++.pc 
    309297%{_libdir}/pkgconfig/ImageMagick++.pc 
    … …  
    315303%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt 
    316304 
    317  
    318305%changelog 
    319306* Sun May 01 2005 Cristy <cristy@mystic.es.dupont.com> 1.0-0 
Note: See TracChangeset for help on using the changeset viewer.