updated: arts, kdelibs3

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

a/arts/arts-vl.spec

@@ -1,5 +1,3 @@
-%define beta 0
-%define alsa 1
 %define run_test 0
 %define make_cvs 1
 
@@ -8,20 +6,13 @@ Summary: aRts (analog realtime synthesizer) - the KDE 3 sound system
 Summary(ja): aRts - KDE 3 サウンドシステム
 Epoch: 1
 Version: 1.5.10
-%if %{beta}
+Release: 4%{?_dist_release}
-Release: 0.%{beta}%{?_dist_release}
+
-%else
-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/3.5.10/src/%{name}-%{version}.tar.bz2
-%endif
 
 Patch1: arts-1.1.4-debug.patch
 Patch2: arts-1.3.92-glib2.patch
@@ -44,25 +35,20 @@ Patch200: libltdl-CVE-2009-3736.patch
 Patch300: arts-acinclude.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gcc-c++ libjpeg-devel
+BuildRequires: gcc-c++
-BuildRequires: mesa-libGL-devel mesa-libGLU-devel
+BuildRequires: qt-devel >= 3.3.8
-BuildRequires: libmng-devel zlib-devel audiofile-devel
+BuildRequires: alsa-lib-devel
-BuildRequires: qt-devel >= 3.3.2, libpng-devel >= 1.2.5
+BuildRequires: audiofile-devel
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
 BuildRequires: libogg-devel libvorbis-devel glib2-devel
 BuildRequires: esound-devel jack-audio-connection-kit-devel 
 BuildRequires: pkgconfig
-%if %{alsa}
-BuildRequires: alsa-lib-devel
-%endif
 %if %{run_test}
 BuildRequires: kdelibs3
 %endif
 
-# We don't want to require X11, Qt or glib2, arts is perfectly usable without
-# them, they're just used by addons the qtmcop, gmcop and x11globalcomm addons
-AutoReq: off
-#Requires: XFree86-gl XFree86-libs freetype2 libjpeg libmng libpng zlib
-#Requires: audiofile glibc
 Obsoletes: kdelibs-sound
 Provides: kdelibs-sound
 
@@ -83,7 +69,9 @@ Summary: Development files for the aRts sound server
 Summary(ja): aRts サウンドサーバの開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: qt-devel
 Requires: glib2-devel
+Requires: pkgconfig
 Obsoletes: kdelibs-sound-devel
 Provides: kdelibs-sound-devel
 
@@ -136,9 +124,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
     --disable-dependency-tracking \
     --enable-new-ldflags \
     --disable-libmad \
-%if %{alsa}
     --with-alsa \
-%endif
     --enable-final
 
 make %{?_smp_mflags}
@@ -209,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Sat Jul 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.10-4
+- disabled AutoReq: off
+
 * 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

k/kdelibs3/kdelibs3-vl.spec

@@ -1,18 +1,14 @@
-#define qt3 qt3
 %define qt3_version 3.3.8
 %define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
 
 %define kde_major_version 3
-%define vine3 %(grep -c 3. /etc/vine-release)
-%define vine5 %(grep -c 5. /etc/vine-release)
-
 %define apidocs 1
 
 Summary: K Desktop Environment 3 - Libraries
 Summary(ja): K デスクトップ環境 3 - ライブラリ
 Name: kdelibs3
 Version: 3.5.10
-Release: 1%{?_dist_release}
+Release: 4%{?_dist_release}
 
 License: LGPLv2
 URL: http://www.kde.org/
@@ -98,28 +94,37 @@ Patch220: kdelibs-3.5.5-khtml-overflow-CVE-2006-4811.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cups-devel >= 1.1.12
-BuildRequires: qt-devel >= 3.3.2 arts-devel >= 1:1.5.0
+BuildRequires: qt-devel >= 3.3.2
-BuildRequires: flex >= 2.5.4a-13 libxslt-devel >= 1.0.9
+BuildRequires: arts-devel >= 1:1.5.0
+BuildRequires: flex >= 2.5.4a-13
+BuildRequires: libxml2-devel 
+BuildRequires: libxslt-devel >= 1.0.9
 BuildRequires: libart_lgpl-devel >= 2.3.8
-BuildRequires: doxygen sgml-common openjade jadetex openldap-devel
+BuildRequires: doxygen sgml-common openjade jadetex 
-BuildRequires: docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel
+BuildRequires: docbook-dtds docbook-style-dsssl docbook-utils  
-BuildRequires: libjpeg-devel libmng-devel libtiff-devel zlib-devel 
+BuildRequires: perl-SGMLSpm pcre-devel
 BuildRequires: jasper-devel bzip2-devel gettext openssl-devel
 BuildRequires: libpng-devel >= 1.2.5
-BuildRequires: docbook-dtds aspell-devel libidn-devel gamin-devel
+BuildRequires: aspell-devel libidn-devel
 BuildRequires: OpenEXR-devel
-BuildRequires: alsa-lib-devel avahi-qt3-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: avahi-devel
+BuildRequires: gamin-devel
+BuildRequires: enchant-devel
 %if %{?_dist_release} != "vl4"
 BuildRequires: libICE-devel libSM-devel
 BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
 BuildRequires: krb5-devel
+BuildRequires: libutempter-devel
+BuildRequires: libacl-devel libattr-devel
 %else
 # Vine Linux 4.x
 BuildRequires: XOrg-devel
 %endif
 
-Requires: qt >= 3.3.2 arts >= 1:1.5.0 perl python libart_lgpl openldap
+Requires: qt >= 3.3.2
-Requires: pcre cyrus-sasl libogg libvorbis jasper openssl libidn
+Requires: arts >= 1:1.5.0 perl libart_lgpl 
+Requires: pcre cyrus-sasl jasper openssl libidn
 Requires: cups-libs >= 1.1.12
 Requires: alsa-lib
 Requires: vine-menus
@@ -153,7 +158,6 @@ Summary(ja): KDE 3 アプリケーションをコンパイルするためのヘ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt-devel >= 3.3.2
-Requires: pcre-devel
 Obsoletes: kdelibs-devel < %{version}-%{release}
 Provides:  kdelibs-devel = %{version}-%{release}
 
@@ -267,19 +271,22 @@ export DO_NOT_COMPILE="libkscreensaver"
     --enable-libsuffix="64" \
 %endif
     --with-qt-libraries=$QTDIR/lib \
-    --enable-cups \
+    --with-extra-includes=%{_includedir}/avahi-compat-libdns_sd \
-    --enable-mitshm \
     --enable-pie \
-    --with-alsa \
+    --enable-mitshm \
-    --without-hspell \
-    --disable-libfam \
     --enable-dnotify \
     --enable-inotify \
+    --with-acl \
+    --with-alsa \
     --with-utempter \
+    --without-lua \
+    --with-libidn \
+    --with-libart \
     --with-jasper \
     --with-openexr \
-    --with-xinerama \
+    --with-aspell \
-    --with-distribution="Vine Linux"
+    --without-hspell \
+    --with-distribution=VineLinux
 
 %if %{apidocs}
 # make KDE API documentation
@@ -533,6 +540,14 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 
 %changelog
+* Sun Jul 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-4
+- rebuilt for VineSeed
+  * Tue Jul 13 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-3vl5
+  - added BR: libutempter-devel, libacl-devel, libattr-devel, enchant-devel
+  - added --with-extra-includes=%%{_includedir}/avahi-compat-libdns_sd
+  - removed --with-xinerama, --disable-fam from configure
+  - removed BR: openldap-devel
+
 * Sat Mar 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
 - updated to 3.5.10 based on FC (includes the following security fixes)
   * Mon Dec 07 2009 Than Ngo <than@redhat.com> - 3.5.10-21