Author: glen Date: Wed Apr 5 22:50:33 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdelibs.spec (1.448.2.2 -> 1.448.2.3)
---- Diffs:
================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.448.2.2 SPECS/kdelibs.spec:1.448.2.3
--- SPECS/kdelibs.spec:1.448.2.2 Tue Mar 28 16:22:47 2006
+++ SPECS/kdelibs.spec Thu Apr 6 00:50:28 2006
@@ -2,19 +2,15 @@
#
# Conditional build:
%bcond_without alsa # build without ALSA support
-%bcond_without apidocs # do not prepare API documentation
+%bcond_without apidocs # don't prepare API documentation
%bcond_without autoreqdep # don't care about package name deps generated
by rpm
%bcond_without heimdal # disable kerberos
-%bcond_without exr # disable openexr support (partial BR deps,
doesn't always build)
%bcond_with verbose # verbose build
%bcond_with hidden_visibility # pass '--fvisibility=hidden'
# & '--fvisibility-inlines-hidden'
- # to g++
+ # to g++
#
%define _state stable
-%define _kdever 3.5.2
-%define _ver 3.5.2
-
%define artsver 13:1.5.2
Summary: K Desktop Environment - libraries
@@ -25,12 +21,12 @@
Summary(ru): K Desktop Environment - âÉÂĚÉĎÔĹËÉ
Summary(uk): K Desktop Environment - âŚÂĚŚĎÔĹËÉ
Name: kdelibs
-Version: %{_ver}
+Version: 3.5.2
Release: 1
Epoch: 9
License: LGPL
Group: X11/Libraries
-Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
+Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
# Source0-md5: 367738696dc468859cf90d5a6e8f18a9
Source1: %{name}-wmfplugin.tar.bz2
# Source1-md5: df0d7c2a13bb68fe25e1d6c009df5b8d
@@ -48,7 +44,7 @@
Patch7: %{name}-xgl.patch
Patch8: %{name}-tango.patch
URL: http://www.kde.org/
-%{?with_exr:BuildRequires: OpenEXR-devel >= 1.2.2}
+BuildRequires: OpenEXR-devel >= 1.2.2
BuildRequires: acl-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: arts-qt-devel >= %{artsver}
@@ -70,9 +66,9 @@
%{?with_hidden_visibility:BuildRequires: gcc-c++ >=
5:4.1.0-0.20051206r108118.1}
BuildRequires: gettext-devel
%{?with_apidocs:BuildRequires: graphviz}
+%{?with_heimdal:BuildRequires: heimdal-devel}
BuildRequires: hspell-devel
BuildRequires: jasper-devel >= 1.600
-%{?with_heimdal:BuildRequires: heimdal-devel}
BuildRequires: libart_lgpl-devel
BuildRequires: libidn-devel
BuildRequires: libjpeg-devel
@@ -82,10 +78,10 @@
BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:1.5-2
BuildRequires: libvorbis-devel
+BuildRequires: libwmf-devel >= 2:0.2.0
BuildRequires: libxml2-devel >= 2.4.9
BuildRequires: libxml2-progs
BuildRequires: libxslt-devel >= 1.0.7
-BuildRequires: libwmf-devel >= 2:0.2.0
BuildRequires: lua50-devel
BuildRequires: mDNSResponder-devel >= 107-2
BuildRequires: openmotif-devel
@@ -95,33 +91,33 @@
BuildRequires: qt-devel >= 6:3.3.3-4
%{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1}
%{?with_apidocs:BuildRequires: qt-doc}
-#BuildRequires: unsermake >= 040511
BuildRequires: rpmbuild(macros) >= 1.129
+#BuildRequires: unsermake >= 040511
BuildRequires: zlib-devel
%if %{with autoreqdep}
BuildConflicts: kdebase-core < 9:3.4.0
BuildConflicts: kdepim-korganizer-libs
BuildConflicts: kdepim-libkdepim < 3:3.3.0
%endif
-Requires: setup >= 2.4.6-7
Requires: arts >= %{artsver}
Requires: docbook-dtd412-xml
Requires: docbook-dtd42-xml
Requires: docbook-style-xsl
Requires: hicolor-icon-theme
Requires: qt >= 6:3.3.3-4
+Requires: setup >= 2.4.6-7
Obsoletes: arts-kde
Obsoletes: kde-theme-keramik
-Obsoletes: %{name}-kabc
+Obsoletes: kdelibs-kabc
+Obsoletes: kdelibs-sound
Obsoletes: kdelibs2
Obsoletes: kdelibs2-sound
-Obsoletes: kdelibs-sound
Obsoletes: kdesupport
Obsoletes: kdesupport-devel
-Obsoletes: kdesupport-static
Obsoletes: kdesupport-mimelib
Obsoletes: kdesupport-mimelib-devel
Obsoletes: kdesupport-mimelib-static
+Obsoletes: kdesupport-static
Obsoletes: kimproxy
# No longer supported/existing
Obsoletes: arts-message
@@ -144,6 +140,7 @@
Obsoletes: kdesdk
Obsoletes: kdesdk-devel
# More
+Obsoletes: kde-style-plastik
Obsoletes: kdepim-kaddressbook < 3:3.1.91.030918-1
Obsoletes: kdepim-kmail < 3:3.1.91.030918-1
Obsoletes: kdepim-kontact < 3:3.1.91.030918-1
@@ -153,11 +150,10 @@
Obsoletes: kdepim-libkdepim < 3:3.2.90
Obsoletes: kdetoys-kaphorism < 9:3.2.0
Obsoletes: openoffice-mimelinks
-Obsoletes: kde-style-plastik
Conflicts: kaffeine <= 0.5-1
Conflicts: kdeaddons-konqueror < 1:3.4.0
Conflicts: kdebase-core < 9:3.4.0
-Conflicts: kdenetwork-kit < 10:3.3.0
+Conflicts: kdenetwork-kit < 10:3.3.0
Conflicts: kdepim-devel < 3:3.2.90
Conflicts: kmplayer <= 2:0.8.4-1
Conflicts: kplayer < 0.5.1-5
@@ -245,9 +241,9 @@
Requires: qt-devel >= 6:3.3.3-4
Obsoletes: arts-kde-devel
Obsoletes: kdelibs-sound-devel
+Obsoletes: kdelibs-static
Obsoletes: kdelibs2-devel
Obsoletes: kdelibs2-sound-devel
-Obsoletes: kdelibs-static
Obsoletes: kttsd-devel
Conflicts: kdebase-devel <= 9:3.1.90
@@ -371,12 +367,7 @@
--with-lua-includes=%{_includedir}/lua50 \
--with-distribution="PLD Linux Distribution"
-%{__make} \
- %{?with_verbose:VERBOSE=1} \
- CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
- CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
- AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)'
-
+%{__make}
%{?with_apidocs:%{__make} apidox}
%install
@@ -555,7 +546,7 @@
%{_datadir}/services/bmp.kimgio
%{_datadir}/services/dds.kimgio
%{_datadir}/services/eps.kimgio
-%{?with_exr:%{_datadir}/services/exr.kimgio}
+%{_datadir}/services/exr.kimgio
%{_datadir}/services/gif.kimgio
%{_datadir}/services/hdr.kimgio
%{_datadir}/services/ico.kimgio
@@ -826,8 +817,8 @@
%attr(755,root,root) %{_libdir}/kde3/kimg_dds.so
%{_libdir}/kde3/kimg_eps.la
%attr(755,root,root) %{_libdir}/kde3/kimg_eps.so
-%{?with_exr:%{_libdir}/kde3/kimg_exr.la}
-%{?with_exr:%attr(755,root,root) %{_libdir}/kde3/kimg_exr.so}
+%{_libdir}/kde3/kimg_exr.la
+%attr(755,root,root) %{_libdir}/kde3/kimg_exr.so
%{_libdir}/kde3/kimg_hdr.la
%attr(755,root,root) %{_libdir}/kde3/kimg_hdr.so
%{_libdir}/kde3/kimg_ico.la
@@ -1012,6 +1003,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.448.2.3 2006/04/05 22:50:28 glen
+- merge with HEAD
+
Revision 1.448.2.2 2006/03/28 14:22:47 glen
- add exr bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.448.2.2&r2=1.448.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
