rpms/kdelibs/devel kdelibs.spec,1.209,1.210

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv686

Modified Files:
	kdelibs.spec 
Log Message:
* Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
- make qtdocdir handling robust
- kde_settings=1
- Req: -desktop-backgrounds-basic



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- kdelibs.spec	16 May 2007 16:01:55 -0000	1.209
+++ kdelibs.spec	17 May 2007 15:19:44 -0000	1.210
@@ -3,7 +3,7 @@
 
 #define debug 1 
 %define final 1
-%define kde_settings 0
+%define kde_settings 1 
 %define apidocs 1
 
 %define qt_epoch 1
@@ -14,7 +14,8 @@
 %define arts_version 1.5.6
 %define kde_major_version 3
 
-%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
+%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
+%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
 
 %define make_cvs 1
 %define arts 1
@@ -23,7 +24,7 @@
 Summary: K Desktop Environment - Libraries
 Epoch:	 6
 Version: 3.5.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -50,13 +51,13 @@
 Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
 Patch41: kdelibs-3.5.6-utempter.patch
 
-# kstandarddirs patch, use /etc/kde in addition to /usr/share/config, borrowed from debian
+# use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch104: kdelibs-3.5.5-kstandarddirs.patch
 
 # upstream patches
 Patch500: kdelibs-3.5.6-qt3.3.8.patch
 Patch501: kdelibs-3.5.6-kde#126812.patch
-# http://bugs.kde.org/101956 (kget ignores simultaneous download limit)
+# kget ignores simultaneous download limit (kde #101956)
 Patch101956: kdelibs-3.5.0-101956.patch
 # automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
 Patch137675: kdelibs-3.5.6-137675.patch
@@ -68,24 +69,24 @@
 Patch1000: kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch
 
 Requires: arts >= %{arts_epoch}:%{arts_version}
-Requires: qt >= %{qt_epoch}:%{qt_version}
+Requires: qt >= %{qt_epoch}:%{qt_ver}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
+Requires: hicolor-icon-theme
 Requires: iceauth
-
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
-%else
-Requires: redhat-artwork >= 0.239-2
 %endif
-Requires: desktop-backgrounds-basic
-Requires: hicolor-icon-theme
+Requires: libkdnssd
+## don't think these are *strictly* required anymore, and if so,
+## should prolly be in kdebase -- Rex
+#Requires: redhat-artwork >= 0.239-2
+#Requires: desktop-backgrounds-basic
 Requires: redhat-menus >= 5.0.4
+Requires: shadow-utils
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: shadow-utils
-Requires: libkdnssd
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
@@ -139,7 +140,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Requires: qt-devel >= %{qt_epoch}:%{qt_version}
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: qt-devel
 Requires: arts-devel
@@ -198,7 +198,6 @@
 %patch137675 -p0 -b .kde#137675
 %patch140768 -p1 -b .kde#140768
 
-
 # security
 %patch1000 -p0 -b .bz#225420-CVE-2007-0537
 
@@ -355,7 +354,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %dir %{_sysconfdir}/kde
 %dir %{_sysconfdir}/kde/xdg
@@ -424,20 +423,20 @@
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
-%{_libdir}/kde3
-%{_datadir}/applications
-%{_datadir}/apps
+%{_libdir}/kde3/
+%{_datadir}/applications/
+%{_datadir}/apps/
 %{_datadir}/locale/all_languages
 %dir %{_datadir}/config
 %config(noreplace) %{_datadir}/config/*
 %{_datadir}/emoticons
 %{_datadir}/icons/crystalsvg/
 %{_datadir}/icons/default.kde
-%{_datadir}/mimelnk
-%{_datadir}/autostart
-%{_datadir}/services
+%{_datadir}/mimelnk/
+%{_datadir}/autostart/
+%{_datadir}/services/
 %ghost %{_datadir}/services/ksycoca
-%{_datadir}/servicetypes
+%{_datadir}/servicetypes/
 %dir %{_docdir}/HTML
 %dir %{_docdir}/HTML/en
 %{_docdir}/HTML/en/common
@@ -460,12 +459,17 @@
 
 
 %changelog
+* Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
+- make qtdocdir handling robust
+- kde_settings=1
+- Req: -desktop-backgrounds-basic
+
 * Wed May 16 2007 Than Ngo <than at redhat.com> - 3.5.6-8.fc7
 - add correct qt-version to build kde apidocs ,bz#239947
 - disable kde_settings
 
 * Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-7
-- BR: +keyutils-libs-devel (until krb5-devel's Reqs are fixed)
+- BR: +keyutils-libs-devel (until krb5 is fixed, bug #240220)
 
 * Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
 - kde.sh: fix typo/thinko