update: ImageMagick, calibre, dvdauthor, inkscape, koffice, pstoedit, xine-lib, self-build-xine-lib-extras

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

I/ImageMagick/ImageMagick-vl.spec

@@ -1,19 +1,19 @@
 # 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.1
-%define Patchlevel 5
+%define VER 6.6.4
+%define Patchlevel 8
 
+Name: ImageMagick
 Summary: X application for displaying and manipulating images.
 Summary(ja): 画像ファイルの表示/処理を行う X のアプリケーション
-Name: ImageMagick
 
 %if "%{Patchlevel}" != ""
 Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
 License: freeware
 Group: Applications/Graphics
@@ -26,21 +26,39 @@ Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.bz2
 URL: http://www.imagemagick.org/
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: bzip2-devel, libjpeg-turbo-devel
-BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl
-BuildRequires: freetype2-devel >= 2.1.7, libpng-devel >= 1.2.5
-BuildRequires: libX11-devel, libXext-devel
-BuildRequires: xorg-x11-server-utils
-BuildRequires: libxml2-devel, librsvg2-devel
-BuildRequires: lcms-devel
-BuildRequires: graphviz-devel, OpenEXR-devel, ilmbase-devel
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel
+BuildRequires: freetype2-devel >= 2.1.7
 BuildRequires: fontconfig-devel
+BuildRequires: giflib-devel
+BuildRequires: graphviz-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libpng-devel >= 1.2.5
+BuildRequires: librsvg2-devel
+BuildRequires: libtiff-devel
+BuildRequires: libxml2-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libXext-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: perl
+BuildRequires: xorg-x11-server-utils
+BuildRequires: zlib-devel
 
-Requires: bzip2, freetype2, libjpeg-turbo, libpng, libtiff, libungif, zlib
-Requires: xorg-x11-server-utils
-Requires: libxml2
+Requires: bzip2
+Requires: freetype2
+Requires: giflib
+Requires: graphviz
 Requires: lcms
-Requires: graphviz, OpenEXR-libs, ilmbase
+Requires: libjpeg-turbo
+Requires: libpng
+Requires: libtiff
+Requires: libxml2
+Requires: OpenEXR-libs
+Requires: xorg-x11-server-utils
+Requires: zlib
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -106,7 +124,8 @@ ImageMagick のコードや API を使ったアプリケーションを作りた
 Summary: ImageMagick perl bindings
 Summary(ja): ImageMagick の Perl バインディング
 Group: Development/Libraries
-Requires: ImageMagick = %{version}-%{release}, perl >= 5.8.0
+Requires: ImageMagick = %{version}-%{release}
+Requires: perl >= 5.8.0
 
 %description perl
 Perl bindings to ImageMagick.
@@ -179,21 +198,22 @@ ImageMagick プログラムを使うだけの場合，あるいは ImageMagick C
 #patch1 -p1 -b .CVE-2006-5456
 
 %build
-%configure --enable-shared \
-	   --disable-static \
-	   --with-x \
-	   --with-quantum-depth=16 \
-	   --with-modules --enable-lzw \
-	   --without-frozenpaths \
-           --with-perl \
-	   --without-wmf \
-	   --without-jp2 \
-	   --without-jbig \
-	   --without-djvu \
-	   --without-fftw \
-	   --with-lcms \
-           --without-dot \
-           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'"
+%configure \
+    --enable-silent-rules \
+    --enable-shared \
+    --disable-static \
+    --with-modules \
+    --with-quantum-depth=16 \
+    --without-frozenpaths \
+    --with-x \
+    --without-djvu \
+    --without-fftw \
+    --without-jbig \
+    --without-jp2 \
+    --without-lcms2 \
+    --without-wmf \
+    --with-perl \
+    --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'"
 
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -305,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 6.6.4.8-1
+- new upstream release 
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.6.1.5-2
 - rebuild with rpm-4.8.1 for pkg-config file
 - change BuildRequires: libjpeg-turbo-devel instead of libjpeg-devel

c/calibre/calibre-vl.spec

@@ -1,9 +1,10 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.7.18
-Release:        1%{?dist}
 Summary:        E-book converter and library management
+Version:        0.7.18
+Release:        2%{?_dist_release}
+
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://calibre-ebook.com/
@@ -226,21 +227,26 @@ done;
 %{__rm} -rf %{buildroot}
 
 %post
-update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %postun
-update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database &> /dev/null ||:
+    update-mime-database %{_datadir}/mime &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor || :
+    if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    fi
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_datadir}/mime >& /dev/null
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %files -f %{name}.lang
 
 %defattr(-,root,root,-)
@@ -258,6 +264,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.18-2
+- rebuilt with ImageMagick-6.6.4.8
+- added %%posttrans section
+
 * Wed Sep 29 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.18-1
 - new upstream release
 - Fix svg/png changes. 

d/dvdauthor/dvdauthor-vl.spec

@@ -3,10 +3,10 @@
 %define with_GraphicsMagick 0
 
 Name:           dvdauthor
-Version:        0.6.18
-Release:        1%{?_dist_release}
 Summary:        Command line DVD authoring tool
-Summary(ja):     コマンドライン DVD 作成ツール
+Summary(ja):    コマンドライン DVD 作成ツール
+Version:        0.6.18
+Release:        2%{?_dist_release}
 
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -82,6 +82,9 @@ export LDFLAGS="$LDFLAGS -Wl,--as-needed" # avoid *Magick-config linkage bloat
 
 
 %changelog
+* Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.18-2
+- rebuilt with ImageMagick-6.6.4.8
+
 * Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.18-1
 - new upstream release
 - rebuilt with new toolchain and ImageMagick 6.6.1.5

i/inkscape/inkscape-vl.spec

@@ -3,16 +3,14 @@
 Name:		inkscape
 Summary:	A Vector Drawing Application
 Summary(ja):	ベクトル描画アプリケーション
-Version:	0.47
-Release:	3%{?_dist_release}
-License:	GPL
+Version:	0.48.0
+Release:	1%{?_dist_release}
+
 Group:		Applications/Graphics
+License:	GPLv2
 URL:		http://www.inkscape.org/
 
-Source:		%{name}-%{version}.tar.bz2
-Patch0:		inkscape-poppler-0.12.2.patch
-
-Patch10:	%{name}-22184-vine.patch
+Source:		http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel >= 2.8.0
@@ -40,8 +38,6 @@ Linux/Unix/Windows/Mac で動作します。
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch10 -p1
 
 %build
 %configure \
@@ -55,25 +51,49 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
+
 %makeinstall
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+
 %find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
+%post 
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q &> /dev/null
+    touch --no-create %{_iconsdir}/icons/hicolor &> /dev/null
+    gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/inkscape
 %{_bindir}/inkview
-#%{_libdir}/inkscape
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*
 %{_datadir}/inkscape
 %{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
+* Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.48-1
+- new upstream release
+- rebuilt with ImageMagick-6.6.4.8
+- dropt Patch0 and Patch10 (merged into upstream)
+
 * Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.47-3
 - added Patch0 for building with poppler-0.12.2+
 - rebuilt with new toolchain and ImageMagick-6.6.1.5

k/koffice/koffice-vl.spec

@@ -5,7 +5,7 @@ URL: http://koffice.kde.org/
 Summary: Integrated office suite for KDE
 Summary(ja): KDE 向け統合オフィススイート
 Version: 1.6.3
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Epoch: 1
 Group: Applications/Productivity
 License: GPL
@@ -22,7 +22,7 @@ Patch101: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: qt-devel >= 3.3.2, kdelibs3-devel >= 3.3, arts-devel >= 1:1.3
 BuildRequires: aspell-devel >= 0.50.2, wv2-devel >= 0.1.8
-BuildRequires: libjpeg-devel libmng-devel libtiff-devel zlib-devel
+BuildRequires: libjpeg-turbo-devel libmng-devel libtiff-devel zlib-devel
 BuildRequires: libxml2-devel libxslt-devel freetype2-devel libart_lgpl-devel
 BuildRequires: jasper-devel doxygen ImageMagick-devel pkgconfig
 BuildRequires: libpng-devel libgsf-devel lcms-devel libexif-devel
@@ -140,6 +140,8 @@ popd
 cd %{name}-l10n-ja-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/pl 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -169,6 +171,9 @@ kbuildsycoca &>/dev/null || :
 %{_datadir}/templates
 
 %changelog
+* Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.3-4
+- rebuilt with ImageMagick-6.6.4.8
+
 * Tue May  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.3-3
 - rebuilt with new toolchain and ImageMagick-6.6.1.5
 - fixed configure for building with python-2.6

lib/libf/libfprint/libfprint-vl.spec

@@ -1,15 +1,16 @@
+Name:           libfprint
 Summary:        Tool kit for fingerprint scanner
 Summary(ja):    指紋スキャナツールキット
-Name:           libfprint
 Version:        0.1.0
-Release:        2.pre2%{?_dist_release}
+Release:        3.pre2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.reactivated.net/fprint/wiki/Main_Page 
+
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre2.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 # FIXME remove the ImageMagick dependency when we either have the
 # gdk-pixbuf support merged, or disable the driver that requires it (F10)
 BuildRequires:  libusb1-devel ImageMagick-devel glib2-devel openssl-devel 
@@ -70,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.1.0-3.pre2
+- rebuilt with ImageMagick-6.6.4.8
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.0-2.pre2
 - rebuild with rpm-4.8.1 for pkg-config file
 

nonfree/self-build-xine-lib-extras/self-build-xine-lib-extras-vl.spec

@@ -6,9 +6,9 @@
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		self-build-%{pkgname}
-Version:	1.1.18.1
+Version:	1.1.19
 Release: 	1%{?_dist_release}
-License:	GPL
+License:	GPLv2
 Group:		Restricted Software
 
 Source0:	%{pkgname}-vl.spec
@@ -121,6 +121,9 @@ purpose or way of use and take appropriate action.
 %{_datadir}/%{name}
 
 %changelog
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.19-1
+- new upstream release
+
 * Fri Mar 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.18.1-1
 - new upstream release
 - built with new toolchain

nonfree/self-build-xine-lib-extras/xine-lib-extras-vl.spec

@@ -1,15 +1,15 @@
 %define source_name xine-lib
 %define libname libxine1
 %define plugindir %{_libdir}/xine/plugins
-%define pluginver 1.28
+%define pluginver 1.29
 
 Name: xine-lib-extras
-Version: 1.1.18.1
-Release: 1%{?_dist_release}
 Summary: addtional plugins for xine
 Summary(ja): xine 用の追加プラグイン
+Version: 1.1.19
+Release: 1%{?_dist_release}
 
-License: GPL
+License: GPLv2
 Group: System Environment/Libraries
 URL: http://www.xine-project.org/
 Source0: http://prdownloads.sourceforge.net/xine/%{source_name}-%{version}.tar.bz2
@@ -231,6 +231,10 @@ sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 %{plugindir}/%{pluginver}/xineplug_decode_a52.so
 
 %changelog
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.19-1
+- new upstream release
+- built with ImageMagick-6.6.4.8
+
 * Fri Mar 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.18.1-1
 - new upstream release
 - built with new toolchain

p/pstoedit/pstoedit-vl.spec

@@ -1,8 +1,9 @@
+Name:            pstoedit
 Summary:         Translator of PostScript and PDF graphics into various vector formats
 Summary(ja):     ポストスクリプトやPDFを多種多様なベクタ形式に変換
-Name:            pstoedit
 Version:         3.50
-Release:         2%{?_dist_release}
+Release:         3%{?_dist_release}
+
 Group:           Applications/Graphics
 License:         GPLv2
 URL:             http://www.pstoedit.net/pstoedit
@@ -195,7 +196,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/pstoedit/*.la
 
 %changelog
-* Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 3.50-2
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.50-3
+- rebuilt with ImageMagick-6.6.4.8
+
+* Thu Sep 30 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.50-2
 - rebuilt with rpm-4.8.1 for pkg-config
 
 * Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.50-1

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

@@ -1,6 +1,6 @@
 %define libname libxine1
 %define plugindir %{_libdir}/xine/plugins
-%define pluginver 1.28
+%define pluginver 1.29
 
 %define build_alsa	 1
 %define build_arts	 0
@@ -15,9 +15,9 @@
 Summary:	A Free Multimedia Player (Libraries)
 Summary(ja):	フリーのメディアプレイヤー (ライブラリ)
 Name:		xine-lib
-Version:	1.1.18.1
-Release:	3%{?_dist_release}
-License:	GPL
+Version:	1.1.19
+Release:	1%{?_dist_release}
+License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://xinehq.de/
 Source:		http://prdownloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
@@ -50,19 +50,22 @@ BuildRequires:	fontconfig-devel
 BuildRequires:  freetype2-devel
 # Audio
 BuildRequires:	alsa-lib-devel >= 0.9.0
+%if %{build_arts}
+BuildRequires:	arts-devel >= 0.9.5
+%endif
 BuildRequires:	esound-devel >= 0.2.8
 BuildRequires:	flac-devel
 %if %{build_jack}
 BuildRequires:  jack-audio-connection-kit-devel
 %endif
 BuildRequires:  libvorbis-devel
+%if %{build_mpc}
+BuildRequires:  libmpcdec-devel
+%endif
 %if %{build_pulseaudio}
 BuildRequires:	pulseaudio-lib-devel
 %endif
 BuildRequires:  speex-devel
-%if %{build_arts}
-BuildRequires:	arts-devel >= 0.9.5
-%endif
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -616,6 +619,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.19-1
+- new upstream release
+- built with ImageMagick-6.6.4.8
+
 * Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 1.1.18.1-3
 - rebuilt with rpm-4.8.1 for pkg-config