updated: arts, poppler, poppler-data

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

a/arts/arts-vl.spec

@@ -4,21 +4,23 @@
 %define make_cvs 1
 
 Name: arts
-Summary: aRts (analog realtime synthesizer) - the KDE sound system
+Summary: aRts (analog realtime synthesizer) - the KDE 3 sound system
+Summary(ja): aRts - KDE 3 サウンドシステム
 Epoch: 1
 Version: 1.5.10
 %if %{beta}
 Release: 0.%{beta}%{?_dist_release}
 %else
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 %endif
 License: LGPLv2
+URL: http://www.kde.org
 Group: System Environment/Daemons
 
 %if %{beta}
 Source: ftp://ftp.kde.org/pub/kde/unstable/%{version}-%{beta}/src/%{name}-%{version}-%{beta}.tar.bz2
 %else
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
 %endif
 
 Patch1: arts-1.1.4-debug.patch
@@ -27,13 +29,21 @@ Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
+# don't pop up a dialog on CPU overload (#361891)
+Patch9: arts-1.5.10-cpu-overload-quiet.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
+# security patches
+# CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
+Patch200: libltdl-CVE-2009-3736.patch
+
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-#PreReq: ldconfig
 BuildRequires: gcc-c++ libjpeg-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
 BuildRequires: libmng-devel zlib-devel audiofile-devel
@@ -41,12 +51,11 @@ BuildRequires: qt-devel >= 3.3.2, libpng-devel >= 1.2.5
 BuildRequires: libogg-devel libvorbis-devel glib2-devel
 BuildRequires: esound-devel jack-audio-connection-kit-devel 
 BuildRequires: pkgconfig
-#libmad-devel
 %if %{alsa}
 BuildRequires: alsa-lib-devel
 %endif
 %if %{run_test}
-BuildRequires: kdelibs
+BuildRequires: kdelibs3
 %endif
 
 # We don't want to require X11, Qt or glib2, arts is perfectly usable without
@@ -71,6 +80,7 @@ playing a wave file with some effects.
 
 %package devel
 Summary: Development files for the aRts sound server
+Summary(ja): aRts サウンドサーバの開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
@@ -100,21 +110,29 @@ KDE applications using sound).
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .cpu-overload-quiet
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
+%patch200 -p1 -b .CVE-2009-3736
+
+%patch300 -p1 -b .acinclude
+
+%build
 %if %{make_cvs}
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
   make -f admin/Makefile.common cvs
 %endif
 
-%build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
     --includedir=%{_includedir}/kde \
     --with-qt-libraries=$QTDIR/lib \
-    --disable-rpath --disable-warnings \
+    --disable-rpath \
+    --disable-debug --disable-warnings \
     --disable-dependency-tracking \
     --enable-new-ldflags \
     --disable-libmad \
@@ -191,8 +209,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Sat Mar 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.10-3
+- rebuilt with new toolchain
+- added Patch9, 200 and 300 from FC
+  * Wed Dec 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.5.10-11
+  - don't pop up a dialog on CPU overload (#361891)
+  * Thu Dec 10 2009 Stepan Kasal <skasal@redhat.com> - 1.5.10-10
+  - patch autoconfigury to build with autoconf >= 2.64
+  * Sun Dec 06 2009 Than Ngo <than@redhat.com> - 1.5.10-9
+  - fix url
+  - fix security issues in libltdl (CVE-2009-3736)
+- added Japanese summary
+- fixed duplicated entry at last changelog
+
 * Sat May  9 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.10-2
-- updated to 1.5.10
 - added Patch1,2,5,8,50 and 51 from Fedora
 - added lib*.la files again...
 

p/poppler-data/poppler-data-vl.spec

@@ -1,5 +1,5 @@
 %define name	poppler-data
-%define version	0.3.0
+%define version	0.4.0
 %define release	1%{?_dist_release}
 
 Summary:	Poppler encoding data.
@@ -47,6 +47,9 @@ Cyrillic properly.
 %{_datadir}/poppler
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.0-1
+- new upstream release
+
 * Mon Nov  2 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.3.0-1
 - new upstream release
 

p/poppler/poppler-vl.spec

@@ -1,5 +1,5 @@
 %define name	poppler
-%define version	0.12.1
+%define version	0.12.4
 %define release	1%{?_dist_release}
 
 Summary:	PDF rendering library.
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  openjpeg-devel
 BuildRequires:	cairo-devel, gtk-doc
 BuildRequires:	qt-devel
-BuildRequires:	qt4-devel
+BuildRequires:	qt4-devel >= 4.4.0
 Requires:	poppler-data >= 0.3.0
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -85,6 +85,7 @@ Development files for poppler Qt3 wrapper
 Summary:	Qt4 wrapper for poppler
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	qt4 >= 4.4.0
 
 %description qt4
 Qt4 wrapper for poppler. 
@@ -94,7 +95,7 @@ Summary:	Development files for poppler Qt4 wrapper
 Group:		Development/Libraries
 Requires:	%{name}-qt4 = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	qt4-devel
+Requires:	qt4-devel >= 4.4.0
 
 %description qt4-devel
 Development files for poppler Qt4 wrapper
@@ -108,10 +109,11 @@ Development files for poppler Qt4 wrapper
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
+           --enable-silent-rules \
            --disable-utils \
            --enable-zlib \
            --enable-xpdf-headers \
-           --enable-gtk-doc \
+           --disable-gtk-doc \
            --enable-shared \
            --enable-poppler-qt \
            --enable-poppler-qt4 \
@@ -136,6 +138,13 @@ unset QTDIR && . /etc/profile.d/qt.sh
 
 %postun -p /sbin/ldconfig
 
+%post qt -p /sbin/ldconfig
+
+%postun qt -p /sbin/ldconfig
+
+%post qt4 -p /sbin/ldconfig
+
+%postun qt4 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -178,6 +187,11 @@ unset QTDIR && . /etc/profile.d/qt.sh
 %{_includedir}/poppler/qt4
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.4-1
+- new upstream release (including security fix CVE-2009-3607)
+- built with new toolchain
+- changed --enable-gtk-doc to --disable-gtk-doc
+
 * Mon Nov  2 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.1-1
 - new upstream release (including security fix based xpdf 3.02pl4)
 - added BR: openjpeg-devel