updated: ImageMagicj, libfprint, dvdauthor, inkscape, koffice, pstoedit, xine-lib

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@941 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.5.7
+%define VER 6.6.1
-%define Patchlevel 3
+%define Patchlevel 5
 
 Summary: X application for displaying and manipulating images.
 Summary(ja): 画像ファイルの表示/処理を行う X のアプリケーション
@@ -13,7 +13,7 @@ Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
 License: freeware
 Group: Applications/Graphics
@@ -34,6 +34,7 @@ BuildRequires: xorg-x11-server-utils
 BuildRequires: libxml2-devel, librsvg2-devel
 BuildRequires: lcms-devel
 BuildRequires: graphviz-devel, OpenEXR-devel, ilmbase-devel
+BuildRequires: fontconfig-devel
 
 Requires: bzip2, freetype2, libjpeg, libpng, libtiff, libungif, zlib
 Requires: xorg-x11-server-utils
@@ -179,6 +180,7 @@ ImageMagick プログラムを使うだけの場合，あるいは ImageMagick C
 
 %build
 %configure --enable-shared \
+	   --disable-static \
 	   --with-x \
 	   --with-quantum-depth=16 \
 	   --with-modules --enable-lzw \
@@ -267,10 +269,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Wand-config
 %{_bindir}/MagickCore-config
 %{_bindir}/MagickWand-config
-%{_libdir}/ImageMagick-%{VER}/modules-Q16/*/*.a
+#{_libdir}/ImageMagick-%{VER}/modules-Q16/*/*.a
-%{_libdir}/libMagickCore.a
+#{_libdir}/libMagickCore.a
 %{_libdir}/libMagickCore.so
-%{_libdir}/libMagickWand.a
+#{_libdir}/libMagickWand.a
 %{_libdir}/libMagickWand.so
 %{_libdir}/pkgconfig/ImageMagick.pc
 %{_libdir}/pkgconfig/Wand.pc
@@ -292,7 +294,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Magick++-config
 %{_includedir}/ImageMagick/Magick++
 %{_includedir}/ImageMagick/Magick++.h
-%{_libdir}/libMagick++.a
+#{_libdir}/libMagick++.a
 %{_libdir}/libMagick++.so
 %{_libdir}/pkgconfig/ImageMagick++.pc
 %{_libdir}/pkgconfig/Magick++.pc
@@ -303,6 +305,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 6.6.1.5-1
+- new upstream release 
+- built with new toolchain
+- added --disable-static to %%configure, removed static libraries
+
 * Sun Nov  1 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 6.5.7.3-2
 - added --without-djvu --without-fftw
 

d/dvdauthor/dvdauthor-vl.spec

@@ -3,8 +3,8 @@
 %define with_GraphicsMagick 0
 
 Name:           dvdauthor
-Version:        0.6.14
+Version:        0.6.18
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        Command line DVD authoring tool
 Summary(ja):     コマンドライン DVD 作成ツール
 
@@ -12,20 +12,17 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dvdauthor.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/dvdauthor/%{name}-%{version}.tar.gz
-# Patch0:         %{name}-0.6.14-graphicsmagick.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libdvdread-devel >= 0.9.4-4
 BuildRequires:  libpng-devel
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  libxml2-devel >= 2.6.0
 BuildRequires:  fribidi-devel
-BuildRequires:  freetype-devel
+BuildRequires:  freetype2-devel
 %if %{with_GraphicsMagick}
 BuildRequires:  GraphicsMagick-devel
-# autofoo etc for Patch0
-BuildRequires:  autoconf automake gettext-devel
 %else
 BuildRequires:  ImageMagick-devel
 %endif
@@ -36,11 +33,7 @@ mpeg2 stream that should play when you put it in a DVD player.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
-%if %{with_GraphicsMagick}
-%patch0 -p1 -b .graphicsmagick
-autoreconf # for Patch0
-%endif
 
 # Adapt to changed header location in libdvdread 4.1.3.  *sigh*
 if [ -d %{_includedir}/libdvdread ] ; then
@@ -89,6 +82,10 @@ export LDFLAGS="$LDFLAGS -Wl,--as-needed" # avoid *Magick-config linkage bloat
 
 
 %changelog
+* 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
+
 * Fri Feb  6 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.14-2
 - rebuilt with ImageMagick 6.4.9-2
 - added Japanese summary

i/inkscape/inkscape-vl.spec

@@ -4,21 +4,21 @@ Name:		inkscape
 Summary:	A Vector Drawing Application
 Summary(ja):	ベクトル描画アプリケーション
 Version:	0.47
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 License:	GPL
 Group:		Applications/Graphics
 URL:		http://www.inkscape.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Source:		%{name}-%{version}.tar.bz2
+Patch0:		inkscape-poppler-0.12.2.patch
+
 Patch10:	%{name}-22184-vine.patch
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel >= 2.8.0
 BuildRequires: gnome-vfs2-devel >= 2.0.0
 BuildRequires: libxml2-devel >= 2.6.11
 BuildRequires: libxslt-devel >= 1.0.15
-BuildRequires: libgnomeprint-devel >= 1.116.0
-BuildRequires: libgnomeprintui-devel >= 1.116.0
 BuildRequires: gc-devel >= 6.4
 BuildRequires: libsigc++-devel >= 2.0.12
 BuildRequires: gtkmm2-devel >= 2.4.0
@@ -40,18 +40,16 @@ Linux/Unix/Windows/Mac で動作します。
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 %patch10 -p1
 
 %build
 %configure \
- --with-xinerama \
+    --with-python \
- --enable-static=no \
+    --with-gnome-vfs \
- --with-python \
+    --with-inkjar \
- --with-gnome-vfs \
+    --enable-lcms \
- --with-inkjar \
+    --enable-poppler-cairo
- --enable-inkboard \
- --enable-lcms \
- --enable-poppler-cairo
 
 make %{?_smp_mflags}
 
@@ -76,6 +74,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* 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
+- removed BR: libgnomeprint-devel, libgnomeprintui-devel
+
 * Fri Nov 27 2009 Shu KONNO <owa@bg.wakwak.com> 0.47-2
 - rebuild with poppler-0.12.1
 

k/koffice/koffice-vl.spec

@@ -5,34 +5,44 @@ URL: http://koffice.kde.org/
 Summary: Integrated office suite for KDE
 Summary(ja): KDE 向け統合オフィススイート
 Version: 1.6.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Epoch: 1
-Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}.tar.bz2
-Source1: %{name}-l10n-ja-%{version}.tar.bz2
-Patch0: koffice-xpdf-CVE-2007-3387.diff
-Patch1: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 Group: Applications/Productivity
-Obsoletes: killustrator kivio
 License: GPL
+Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}.tar.bz2
+Source1: %{name}-l10n-ja-%{version}.tar.bz2
+Patch0: koffice-1.6.3-gcc43.patch
+Patch1: koffice-1.6.3-gcc44-elif.patch
+Patch2: koffice-1.6.3-gcc44-glibc210.patch
+
+# security fix
+Patch100: koffice-xpdf-CVE-2007-3387.diff
+Patch101: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2, kdelibs-devel >= 3.3, arts-devel >= 1:1.3
+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: 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
 BuildRequires: MySQL-devel postgresql-devel
+BuildRequires: poppler-qt-devel
+BuildRequires: python-devel
+BuildRequires: libwpd-devel >= 0.8.0
 #if %{?_dist_release} 
 #BuildConflicts: ruby-devel
 #else
 BuildRequires: libpqxx-devel libtool-ltdl-devel ruby-devel
 #endif
-Requires: qt >= 3.3.2, kdelibs >= 3.3, arts >= 1:1.3
+Requires: qt >= 3.3.2, kdelibs3 >= 3.3, arts >= 1:1.3
 Requires: freetype2 libjpeg libtiff libmng libpng
 Requires: zlib audiofile libxml2 libxslt
 Requires: libart_lgpl aspell wv2
-Prereq: ldconfig kdelibs
+Requires(post): kdelibs3
+
+Obsoletes: killustrator kivio
+
 
 %description
 KOffice is a collection of office applications linked together by a common
@@ -53,8 +63,20 @@ The applications currently included in KOffice are:
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p0 -b .CVE-2007-3387
+%if %{?_dist_release} == "vl6"
-%patch1 -p0 -b .xpdf
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .elif
+%patch2 -p3 -b .glibc210
+%endif
+
+%patch100 -p0 -b .CVE-2007-3387
+%patch101 -p0 -b .xpdf
+
+# for Python 2.6
+%if %{?_dist_release} == "vl6"
+sed -i -e 's|""2\.5""|""2\.6""|g' configure
+%endif
+
 
 %build
 #only for beta
@@ -63,14 +85,6 @@ The applications currently included in KOffice are:
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export KDEDIR=%{_prefix}
 
-#CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" \
-#CXXFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG -fno-check-new" \
-#./configure --prefix=%{_prefix} \
-#    --with-qt-libraries=$QTDIR/lib \
-#    --disable-final \
-#    --disable-pie \
-#    --includedir=%{_includedir}/kde \
-#    --disable-rpath
 ./configure --prefix=%{_prefix} \
   --includedir=%{_includedir}/kde \
   --with-qt-libraries=$QTDIR/lib \
@@ -155,6 +169,12 @@ kbuildsycoca &>/dev/null || :
 %{_datadir}/templates
 
 %changelog
+* 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
+- added Patch0-2 for building new toolchain 
+  (Gentoo#228839, Debian#504870, Gentoo#270960)
+
 * Fri May 22 2009 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.3-2
 - added libtiff(-devel) to dependency.
 - rebuilt with MySQL-5.1.34.

lib/libf/libfprint/libfprint-vl.spec

@@ -2,14 +2,13 @@ Summary:        Tool kit for fingerprint scanner
 Summary(ja):    指紋スキャナツールキット
 Name:           libfprint
 Version:        0.1.0
-Release:        1.pre1%{?_dist_release}
+Release:        1.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-pre1.tar.bz2
+Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre2.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-Patch0:         0002-Fix-fp_get_pollfds.patch
 
 # FIXME remove the ImageMagick dependency when we either have the
 # gdk-pixbuf support merged, or disable the driver that requires it (F10)
@@ -33,8 +32,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n %{name}-0.1.0-pre1
+%setup -q -n %{name}-0.1.0-pre2
-%patch0 -p1
 
 %build
 %configure --disable-static 
@@ -72,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.1.0-1.pre2
+- new upstream release
+- dropt Patch0 (merged into upstream)
+- built with new toolchain and ImageMagick-6.6.1.5
+
 * Wed May 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.1.0-1.pre1
 - initial build for Vine Linux
 

p/pstoedit/pstoedit-vl.spec

@@ -1,25 +1,23 @@
 Summary:         Translator of PostScript and PDF graphics into various vector formats
 Summary(ja):     ポストスクリプトやPDFを多種多様なベクタ形式に変換
 Name:            pstoedit
-Version:         3.45
+Version:         3.50
 Release:         1%{?_dist_release}
 Group:           Applications/Graphics
-License:         GPL
+License:         GPLv2
 URL:             http://www.pstoedit.net/pstoedit
-#Source0:         http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/%{name}-%{version}.tar.gz
+
-Source0:         %{name}-%{version}.tar.gz
+Source0:         http://prdownloads.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
-Source1:         http://www.helga-glunz.homepage.t-online.de/plugins/plugins_linux.3.42.tgz
+#Source1:         http://www.helga-glunz.homepage.t-online.de/plugins/plugins_linux_350.tgz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
+BuildRequires:   libemf-devel libpng-devel gd-devel
+BuildRequires:   ImageMagick-c++-devel zlib-devel
+BuildRequires:   libtool sed
+
 Vendor:          Project Vine
 Distribution:    Vine Linux
 
-Requires:        libemf libtiff
-Requires:        ming ImageMagick-c++ freetype2 xorg-x11-libs
-BuildRequires:   libemf-devel libtiff-devel gd-devel
-BuildRequires:   ming ImageMagick-c++-devel freetype2-devel xorg-x11-devel zlib-devel
-Prereq:          perl grep
-
 %description
 pstoedit translates PostScript and PDF graphics into other vector
 formats. Currently pstoedit can generate the following formats:
@@ -86,7 +84,7 @@ Summary(ja):    pstoedit 開発ライブラリ
 Group:          Development/Libraries
 URL:            http://www.pstoedit.net/pstoedit
 Requires:       pstoedit = %{version}-%{release}
-Requires:       libpng-devel libstdc++3-devel zlib-devel 
+Requires:       libpng-devel libstdc++-devel zlib-devel 
 
 %description devel
 pstoedit library
@@ -95,10 +93,8 @@ pstoedit library
 pstoedit 開発ライブラリ
 
 %prep
-%setup -a 1
+%setup -q 
  %{__perl} -p -i -e 's|BINDIR=/usr/local/bin||' autogen.sh
-# %{__perl} -p -i -e 's|_la_LDFLAGS\)|_la_LDFLAGS\) -module -avoid-version|g' Makefile.in
-
 
 %build
 ./autogen.sh
@@ -117,25 +113,20 @@ sed -ie 's/-pedantic//' configure
 # don't use _smp_mflags
 %{__make}
 
-# gcc -o libp2edrvmagick++.so.0.0.0 hoge.c -L`pwd` -Wl,-rpath -Wl,/usr/lib/pstoedit -lhoge
-
-# /usr/lib/pstoedit/libp2edrvstd.so.0.0.0
-# /usr/lib/pstoedit/libp2edrvswf.so.0.0.0
-# /usr/lib/pstoedit/libp2edrvwmf.so.0.0.0
-# /usr/lib/pstoedit/plugins_linux.so
-# 
-
 %install
-rm -rf $RPM_BUILD_ROOT/
+rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-%ifarch %{ix86}
+#ifarch %{ix86}
-%{__install} -m 755 plugins_linux.3.42.so %{buildroot}%{_libdir}/%{name}
+#{__install} -m 755 plugins_linux_350.so %{buildroot}%{_libdir}/%{name}
-%endif
+#endif
 
-%{__mkdir_p} %{buildroot}%{_mandir}/man1
+%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
 %{__install} -m 644 doc/%{name}.1  %{buildroot}%{_mandir}/man1
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/pstoedit.conf
+
 # %{__mkdir_p} %{buildroot}%{_bindir}
 # %{__install} -c config/pstoedit-config %{buildroot}%{_bindir}
 # %{__mkdir_p} %{buildroot}%{_datadir}
@@ -176,20 +167,16 @@ rm -rf $RPM_BUILD_ROOT/
 # 
 
 %clean
-rm -rf $RPM_BUILD_ROOT/
+rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -p /sbin/ldconfig
-/bin/grep -q /usr/lib/pstoedit /etc/ld.so.conf || \
-     echo /usr/lib/pstoedit >> /etc/ld.so.conf
-/sbin/ldconfig
 
-%postun
+%postun -p /sbin/ldconfig
-%{__perl} -p -i -e 's|/usr/lib/pstoedit$||' /etc/ld.so.conf
-/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc copying doc/*.htm
+%{_sysconfdir}/ld.so.conf.d/%{name}.conf
 %{_bindir}/pstoedit
 %{_libdir}/*.so.*
 %dir %{_libdir}/pstoedit
@@ -201,8 +188,6 @@ rm -rf $RPM_BUILD_ROOT/
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-#%{_libdir}/*.*a
-#%{_libdir}/pstoedit/*.*a
 %{_includedir}/pstoedit/*
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*
@@ -210,6 +195,11 @@ rm -rf $RPM_BUILD_ROOT/
 %exclude %{_libdir}/pstoedit/*.la
 
 %changelog
+* Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.50-1
+- new upstream release
+- built with new toolchain and ImageMagick-6.6.1.5
+- used ld.so.conf.d instead of ld.so.conf
+
 * Sun Jun 14 2009 Shu KONNO <owa@bg.wakwak.com> 3.45-1
 - applied new versioning policy, and spec in utf-8
 - update pstoedit to 3.45

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.18.1
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://xinehq.de/
@@ -616,6 +616,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.18.1-2
+- rebuilt with ImageMagick-6.6.1.5
+
 * Fri Mar 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.18.1-1
 - new upstream release
 - built with new toolchain