ImageMagick-6.7.5.10

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5879 ec354946-7b23-47d6-9f5a-488ba84defc7

I/ImageMagick/ImageMagick-vl.spec

@@ -1,8 +1,8 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 6.2.9.7 is actually version 6.2.9, Patchlevel 0.
 
-%define VER 6.6.8
+%define VER 6.7.5
-%define Patchlevel 5
+%define Patchlevel 10
 
 Name: ImageMagick
 Summary: X application for displaying and manipulating images.
@@ -13,14 +13,14 @@ Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 
 License: freeware
 Group: Applications/Graphics
 %if "%{Patchlevel}" != ""
-Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2
+Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
 %else
-Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.bz2
+Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.xz
 %endif
 #Patch1: ImageMagick-6.2.9-CVE-2006-5456_2007-0770.patch
 URL: http://www.imagemagick.org/
@@ -28,11 +28,12 @@ URL: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel
+BuildRequires: pango-devel
 BuildRequires: freetype2-devel >= 2.1.7
 BuildRequires: fontconfig-devel
 BuildRequires: giflib-devel
 BuildRequires: graphviz-devel
-BuildRequires: lcms-devel
+BuildRequires: lcms2-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libpng-devel >= 1.2.5
 BuildRequires: librsvg2-devel
@@ -54,7 +55,7 @@ Requires: bzip2
 Requires: freetype2
 Requires: giflib
 Requires: graphviz
-Requires: lcms
+Requires: lcms2
 Requires: libjpeg-turbo
 Requires: libpng
 Requires: libtiff
@@ -214,7 +215,7 @@ ImageMagick-perl パッケージをインストールして下さい．
     --without-fftw \
     --without-jbig \
     --without-jp2 \
-    --without-lcms2 \
+    --with-lcms2 \
     --without-wmf \
     --with-perl \
     --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'"
@@ -243,6 +244,7 @@ sed -e s,$RPM_BUILD_ROOT,, perl-pkg-files.orig > perl-pkg-files
 
 # remove duplicated doc files
 rm -f `find $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER} -maxdepth 1 -type f`
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # remove files conflict with libtools
 rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*a
@@ -266,7 +268,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc www images
-%doc ChangeLog LICENSE NOTICE QuickStart.txt README.txt index.html
+%doc ChangeLog LICENSE NOTICE QuickStart.txt README.txt NEWS.txt index.html
 %dir %{_libdir}/ImageMagick-%{VER}
 %{_libdir}/ImageMagick-%{VER}/config
 %dir %{_libdir}/ImageMagick-%{VER}/modules-Q16
@@ -276,10 +278,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMagickCore.so.*
 %{_libdir}/libMagickWand.so.*
 %{_bindir}/[a-z]*
-%dir %{_datadir}/ImageMagick-%{VER}
+%{_sysconfdir}/%{name}/*.xml
-%dir %{_datadir}/ImageMagick-%{VER}/config
+%{_sysconfdir}/%{name}/*.icc
-%{_datadir}/ImageMagick-%{VER}/config/*.xml
-%{_datadir}/ImageMagick-%{VER}/config/*.icm
 %{_mandir}/man1/ImageMagick.*
 %{_mandir}/man1/[a-z]*
 
@@ -325,6 +325,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Mar 10 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.7.5.10-1
+- new upstream release
+- add BuildRequires: pango-devel
+- change BuildRequires: lcms2-devel instead of lcms-devel
+
 * Sun Mar 27 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.6.8.5-3
 - add BuildRequires: libXt-devel, xz-devel, xz-lzma-compat, libtool-ltdl-devel
 

b/bluez-hcidump/bluez-hcidump-vl.spec

@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Summary(ja): Bluetooth の HCIプロトコル解析ツール
 Name: bluez-hcidump
-Version: 2.2
+Version: 2.3
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: Applications/System
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 #
 #----------------------------------------------------------------------------
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3-1
+- new upstream release
+
 * Sun Dec 25 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2-1
 - new upstream release
 

b/bluez/bluez-vl.spec

@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Summary(ja): Bluetooth ユーティリティ 
 Name: bluez
-Version: 4.98
+Version: 4.99
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: Applications/System
@@ -286,6 +286,9 @@ exit 0
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.99-1
+- new upstream release
+
 * Thu Feb 23 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.98-1
 - new upstream release
 

c/calibre/calibre-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           calibre
 Version:        0.7.50
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -282,6 +282,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.50-2
+- rebuild with ImageMagick-6.7.5.10
+
 * Sun Mar 20 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.50-1
 - new upstream release
 

d/dvdauthor/dvdauthor-vl.spec

@@ -5,8 +5,8 @@
 Name:           dvdauthor
 Summary:        Command line DVD authoring tool
 Summary(ja):    コマンドライン DVD 作成ツール
-Version:        0.6.18
+Version:        0.7.0
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -82,6 +82,9 @@ export LDFLAGS="$LDFLAGS -Wl,--as-needed" # avoid *Magick-config linkage bloat
 
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.0-1
+- update to 0.7.0
+
 * Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.18-2
 - rebuilt with ImageMagick-6.6.4.8
 

e/emacs24/emacs24-vl.spec

@@ -1,6 +1,6 @@
 %define emacsversion 24.0.94
 #% define bzrdate 20110817
-%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -382,6 +382,9 @@ unset PRIORITY
 
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 24.0.94-2
+- rebuild with ImageMagick-6.7.5.10
+
 * Mon Feb 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.94-1
 - updated to 24.0.94 (24.1 pretest)
 

i/inkscape/inkscape-vl.spec

@@ -2,7 +2,7 @@ Name:		inkscape
 Summary:	A Vector Drawing Application
 Summary(ja):	ベクター描画アプリケーション
 Version:	0.48.2
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 Group:		Applications/Graphics
 License:	GPLv2
@@ -93,6 +93,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_mandir}/fr/man1/*
 
 %changelog
+* Sat Mar 10 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.48.2-2
+- rebuild with ImageMagick-6.7.5.10
+
 * Sat Feb  4 2012 TANAKA hiroaki <mosaicist@par.odn.ne.jp> 0.48.2-1
 - new upstream release
 

l/lcms2/lcms2-vl.spec

@@ -1,14 +1,16 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Name:           lcms2
 Summary:        Color Management Engine
 Summary(ja):    カラーマネージメントエンジン
-Version:        2.2
+Version:        2.3
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.littlecms.com/
 
-Source0:        http://www.littlecms.com/lcms2-2.2.tar.gz
+Source0:        http://www.littlecms.com/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libjpeg-devel
@@ -40,6 +42,30 @@ Provides:       littlecms-devel = %{version}-%{release}
 %description    devel
 Development files for LittleCMS.
 
+
+# compat32
+%package -n 	compat32-%{name}
+Summary:	Color Management Engine
+Summary(ja):    カラーマネージメントエンジン
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description -n	compat32-%{name}
+LittleCMS intends to be a small-footprint, speed optimized color management
+engine in open source form. LCMS2 is the current version of LCMS, and can be
+parallel installed with the original (deprecated) lcms.
+
+%package -n	compat32-%{name}-devel
+Summary:        Development files for LittleCMS
+Summary(ja):    LittleCMS の開発用ファイル
+Group:          Development/Libraries
+Requires:       compat32-%{name} = %{version}-%{release}
+
+%description -n	compat32-%{name}-devel
+Development files for LittleCMS.
+
+
+
 %prep
 %setup -q
 
@@ -83,7 +109,24 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
+%endif
+
+
 %changelog
+* Sat Mar 10 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.3-1
+- new upstream release
+- create compat32 sub packages
+
 * Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.2-1
 - new upstream release
 

lib/libd/libdmtx/libdmtx-vl.spec

@@ -6,7 +6,7 @@
 Name:           libdmtx
 Summary:        Library for working with Data Matrix 2D bar-codes
 Version:        0.7.2
-Release:        6%{?_dist_release}
+Release:        7%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -209,7 +209,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.2-5
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.2-7
+- rebuild with ImageMagick-6.7.5.10
+
+* Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.2-6
 - rebuild with python-2.7.2
 
 

lib/libf/libfprint/libfprint-vl.spec

@@ -2,7 +2,7 @@ Name:           libfprint
 Summary:        Tool kit for fingerprint scanner
 Summary(ja):    指紋スキャナツールキット
 Version:        0.1.0
-Release:        3.pre2%{?_dist_release}
+Release:        4.pre2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.0-4.pre2
+- rebuilt with ImageMagick-6.7.5.10
+
 * Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.1.0-3.pre2
 - rebuilt with ImageMagick-6.6.4.8
 

o/obexd/obexd-vl.spec

@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.44
+Version:	0.45
 Release:	1%{?_dist_release}
 Summary:	D-Bus service for Obex Client access
 Summary(ja):    Obex クライアントアクセスのための D-Bus サービス
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.45-1
+- new upstream release
+
 * Fri Feb 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.44-1
 - new upstream release
 - add BuildRequires: readline-devel

p/pstoedit/pstoedit-vl.spec

@@ -1,8 +1,8 @@
 Name:            pstoedit
 Summary:         Translator of PostScript and PDF graphics into various vector formats
 Summary(ja):     ポストスクリプトやPDFを多種多様なベクタ形式に変換
-Version:         3.50
+Version:         3.60
-Release:         3%{?_dist_release}
+Release:         1%{?_dist_release}
 
 Group:           Applications/Graphics
 License:         GPLv2
@@ -14,6 +14,7 @@ Source0:         http://prdownloads.sourceforge.net/pstoedit/%{name}-%{version}.
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
 BuildRequires:   libemf-devel libpng-devel gd-devel
 BuildRequires:   ImageMagick-c++-devel zlib-devel
+BuildRequires:   ghostscript
 BuildRequires:   libtool sed
 
 Vendor:          Project Vine
@@ -196,6 +197,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/pstoedit/*.la
 
 %changelog
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.60-1
+- update to 3.60
+- add BuildRequires: ghostscript
+
 * Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.50-3
 - rebuilt with ImageMagick-6.6.4.8
 

x/xine-lib/xine-lib-vl.spec

@@ -16,7 +16,7 @@ Summary:	A Free Multimedia Player (Libraries)
 Summary(ja):	フリーのメディアプレイヤー (ライブラリ)
 Name:		xine-lib
 Version:	1.1.19
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://xinehq.de/
@@ -495,11 +495,11 @@ rm -rf $RPM_BUILD_ROOT
 ##{plugindir}/%{pluginver}/xineplug_inp_mms.so
 %{plugindir}/%{pluginver}/xineplug_inp_net.so
 %{plugindir}/%{pluginver}/xineplug_inp_pnm.so
-%{plugindir}/%{pluginver}/xineplug_inp_pvr.so
+#%{plugindir}/%{pluginver}/xineplug_inp_pvr.so
 %{plugindir}/%{pluginver}/xineplug_inp_rtp.so
 %{plugindir}/%{pluginver}/xineplug_inp_rtsp.so
 %{plugindir}/%{pluginver}/xineplug_inp_stdin_fifo.so
-%{plugindir}/%{pluginver}/xineplug_inp_v4l.so
+#%{plugindir}/%{pluginver}/xineplug_inp_v4l.so
 %{plugindir}/%{pluginver}/xineplug_inp_v4l2.so
 ##{plugindir}/%{pluginver}/xineplug_inp_vcd.so
 ##{plugindir}/%{pluginver}/xineplug_inp_vcdo.so
@@ -630,6 +630,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Mar 10 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.19-3
+- rebuild with ImageMagick-6.7.5.10
+
 * Sat Mar 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.19-2
 - added Patch8, 9 and 50
 - rebuilt with libsmbclient-3.5.8