Author: cactus Date: Wed Nov 26 18:12:08 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- new bcond arts
---- Files affected:
SPECS:
kde4-kde3support.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/kde4-kde3support.spec
diff -u SPECS/kde4-kde3support.spec:1.7 SPECS/kde4-kde3support.spec:1.8
--- SPECS/kde4-kde3support.spec:1.7 Mon Nov 24 17:02:59 2008
+++ SPECS/kde4-kde3support.spec Wed Nov 26 19:12:02 2008
@@ -2,6 +2,7 @@
#
# Conditional build:
%bcond_without alsa # build without ALSA support
+%bcond_without arts # build without aRts support
%bcond_without autoreqdep # don't care about package name deps
generated by rpm
%bcond_without kerberos5 # disable kerberos
%bcond_without hidden_visibility # no gcc hidden visibility
@@ -30,8 +31,8 @@
BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: acl-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
-BuildRequires: arts-qt-devel >= %{artsver}
-BuildRequires: artsc-devel >= %{artsver}
+%{?with_arts:BuildRequires: arts-qt-devel >= %{artsver}}
+%{?with_arts:BuildRequires: artsc-devel >= %{artsver}}
BuildRequires: aspell-devel
BuildRequires: audiofile-devel
BuildRequires: autoconf >= 2.52
@@ -84,7 +85,7 @@
BuildConflicts: kdepim-libkdepim < 3:3.3.0
%endif
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: arts >= %{artsver}
+%{?with_arts:Requires: arts >= %{artsver}}
Requires: docbook-dtd412-xml
Requires: docbook-dtd42-xml
Requires: docbook-style-xsl
@@ -174,8 +175,8 @@
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: acl-devel
-Requires: arts-qt-devel >= %{artsver}
-Requires: artsc-devel >= %{artsver}
+%{?with_arts:Requires: arts-qt-devel >= %{artsver}}
+%{?with_arts:Requires: artsc-devel >= %{artsver}}
Requires: fam-devel
Requires: libart_lgpl-devel
Requires: libidn-devel
@@ -184,7 +185,7 @@
Requires: qt-devel >= 6:3.3.3-4
Requires: xorg-lib-libXmu-devel
Requires: xorg-lib-libXt-devel
-Obsoletes: arts-kde-devel
+%{?with_arts:Obsoletes: arts-kde-devel}
Obsoletes: kdelibs-sound-devel
Obsoletes: kdelibs-static
Obsoletes: kdelibs2-devel
@@ -248,6 +249,7 @@
%endif
--enable-mitshm \
--with%{!?with_alsa:out}-alsa \
+ --with%{!?with_arts:out}-arts \
--with-distribution="PLD Linux Distribution" \
--with-ldap=no \
--with-lua-includes=%{_includedir}/lua50 \
@@ -490,7 +492,9 @@
%attr(755,root,root) %{_libdir}/kde3/kdeprint_lpr.so
%attr(755,root,root) %{_libdir}/kde3/kdeprint_rlpr.so
%attr(755,root,root) %{_libdir}/kde3/kdeprint_tool_escputil.so
+%if %{with arts}
%attr(755,root,root) %{_libdir}/kde3/kfileaudiopreview.so
+%endif
%attr(755,root,root) %{_libdir}/kde3/kgzipfilter.so
%attr(755,root,root) %{_libdir}/kde3/khtmlimagepart.so
%attr(755,root,root) %{_libdir}/kde3/kimg_dds.so
@@ -534,8 +538,10 @@
%attr(755,root,root) %{_libdir}/kde3/libshellscript.so
%attr(755,root,root) %{_libdir}/libDCOP.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libDCOP.so.4
+%if %{with arts}
%attr(755,root,root) %{_libdir}/libartskde.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libartskde.so.1
+%endif
%attr(755,root,root) %{_libdir}/libkabc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkabc.so.1
%attr(755,root,root) %{_libdir}/libkabc_dir.so.*.*.*
@@ -642,8 +648,10 @@
%{_libdir}/libDCOP.la
%dir %{_libdir}/kde3dev
%attr(755,root,root) %{_libdir}/kde3dev/libDCOP.so
+%if %{with arts}
%{_libdir}/libartskde.la
%attr(755,root,root) %{_libdir}/kde3dev/libartskde.so
+%endif
%{_libdir}/libkabc.la
%attr(755,root,root) %{_libdir}/kde3dev/libkabc.so
%{_libdir}/libkabc_dir.la
@@ -726,6 +734,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2008/11/26 18:12:02 cactus
+- new bcond arts
+
Revision 1.7 2008/11/24 16:02:59 shadzik
- don't own autostart and services
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kde3support.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
