Accepting request 530581 from home:jengelh:branches:graphics

- Update package summaries and RPM groups.
  Make use of %make_install.

OBS-URL: https://build.opensuse.org/request/show/530581
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=304

ImageMagick.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  2 21:48:11 UTC 2017 - jengelh@inai.de
+
+- Update package summaries and RPM groups.
+  Make use of %make_install.
+
 -------------------------------------------------------------------
 Tue Sep 26 10:15:50 UTC 2017 - pgajdos@suse.com
 

ImageMagick.spec

@@ -117,7 +117,7 @@ Requires:       libMagickCore%{libspec}%{clibver} = %{version}
 Requires:       perl = %{perl_version}
 
 %package devel
-Summary:        Include Files and Libraries Mandatory for Development
+Summary:        Development files for ImageMagick's C interface
 Group:          Development/Libraries/C and C++
 Requires:       ImageMagick = %{version}
 Requires:       glibc-devel
@@ -131,7 +131,7 @@ Requires:       libbz2-devel
 %endif
 
 %package extra
-Summary:        Viewer and Converter for Images - extra codecs
+Summary:        Extra codecs for the ImageMagick image viewer/converter
 Group:          Productivity/Graphics/Other
 Requires:       ImageMagick = %{version}
 Requires:       libMagickCore%{libspec}%{clibver} = %{version}
@@ -143,21 +143,21 @@ Recommends:     netpbm
 Recommends:     transfig
 
 %package -n libMagickCore%{libspec}%{clibver}
-Summary:        Viewer and Converter for Images - runtime library
+Summary:        C runtime library for ImageMagick
 Group:          Productivity/Graphics/Other
 Suggests:       ImageMagick-extra = %{version}
 
 %package -n libMagickWand%{libspec}%{cwandver}
-Summary:        Viewer and Converter for Images - runtime library
+Summary:        C runtime library for ImageMagick
 Group:          Productivity/Graphics/Other
 
 %package -n libMagick++%{libspec}%{cxxlibver}
-Summary:        C++ Interface for ImageMagick - runtime library
+Summary:        C++ interface runtime library for ImageMagick
 Group:          Development/Libraries/C and C++
 Requires:       ImageMagick
 
 %package -n libMagick++-devel
-Summary:        C++ Interface for ImageMagick - files mandatory for development
+Summary:        Development files for ImageMagick's C++ interface
 Group:          Development/Libraries/C and C++
 Requires:       libMagick++%{libspec}%{cxxlibver} = %{version}
 Requires:       libstdc++-devel
@@ -169,7 +169,7 @@ Requires:       ImageMagick-devel = %{version}
 
 %package doc
 Summary:        Document Files for ImageMagick Library
-Group:          Development/Libraries/C and C++
+Group:          Documentation/HTML
 %if 0%{?suse_version} >= 1315
 BuildArch:      noarch
 %endif
@@ -182,7 +182,7 @@ you can create images dynamically, making it suitable for Web
 applications. You can also resize, rotate, sharpen, color-reduce, or
 add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
-the command line as well as through C, C++, and PERL-based programming
+the command line as well as through C, C++, and Perl-based programming
 interfaces.
 
 %description devel
@@ -193,7 +193,7 @@ you can create images dynamically, making it suitable for Web
 applications. You can also resize, rotate, sharpen, color-reduce, or
 add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
-the command line as well as through C, C++, and PERL-based programming
+the command line as well as through C, C++, and Perl-based programming
 interfaces.
 
 %description extra
@@ -207,7 +207,7 @@ you can create images dynamically, making it suitable for Web
 applications. You can also resize, rotate, sharpen, color-reduce, or
 add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
-the command line as well as through C, C++, and PERL-based programming
+the command line as well as through C, C++, and Perl-based programming
 interfaces.
 
 %description -n libMagickCore%{libspec}%{clibver}
@@ -218,7 +218,7 @@ you can create images dynamically, making it suitable for Web
 applications. You can also resize, rotate, sharpen, color-reduce, or
 add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
-the command line as well as through C, C++, and PERL-based programming
+the command line as well as through C, C++, and Perl-based programming
 interfaces.
 
 %description -n libMagickWand%{libspec}%{cwandver}
@@ -229,7 +229,7 @@ you can create images dynamically, making it suitable for Web
 applications. You can also resize, rotate, sharpen, color-reduce, or
 add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
-the command line as well as through C, C++, and PERL-based programming
+the command line as well as through C, C++, and Perl-based programming
 interfaces.
 
 %description -n perl-PerlMagick
@@ -341,9 +341,7 @@ make test_dynamic
 cd ..
 
 %install
-make install \
+%make_install pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
-     DESTDIR=%{buildroot} \
-     pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
 # symlink header file relative to /usr/include/ImageMagick-7/
 # so that inclusions like wand/*.h and magick/*.h work
 ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick