packages (DEVEL): kde4-kdelibs/kde4-kdelibs.spec - merged some changes from...

[cactus]

Author: cactus                       Date: Tue Sep 22 23:46:21 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged some changes from HEAD

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs.spec (1.157.2.5 -> 1.157.2.6) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.5 packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.6
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.5	Tue Sep 22 13:39:51 2009
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Wed Sep 23 01:46:15 2009
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	alsa		# build without ALSA support
-%bcond_without	apidocs		# don't prepare API documentation
 %bcond_without	kerberos5	# disable kerberos
 #
 %define		_state		unstable
@@ -42,7 +40,6 @@
 BuildRequires:	QtWebKit-devel >= %{qtver}
 BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	acl-devel
-%{?with_alsa:BuildRequires:	alsa-lib-devel}
 BuildRequires:	aspell-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	automoc4 >= 0.9.88
@@ -50,16 +47,9 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake >= 2.6.3
 BuildRequires:	cups-devel
-%{?with_apidocs:BuildRequires:	docbook-dtd41-sgml}
-%{?with_apidocs:BuildRequires:	docbook-dtd412-xml}
-%{?with_apidocs:BuildRequires:	docbook-dtd42-xml}
-%{?with_apidocs:BuildRequires:	docbook-style-xsl}
-%{?with_apidocs:BuildRequires:	docbook-utils}
-%{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	enchant-devel
 BuildRequires:	fam-devel
 BuildRequires:	giflib-devel
-%{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	hspell-devel
 BuildRequires:	jasper-devel >= 1.600
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
@@ -84,7 +74,6 @@
 BuildRequires:	phonon-devel >= 4.3.1
 BuildRequires:	pkgconfig
 BuildRequires:	qt4-build >= %{qtver}
-%{?with_apidocs:BuildRequires:	qt4-doc >= %{qtver}}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	shared-mime-info >= 0.18
@@ -96,11 +85,7 @@
 BuildRequires:	zlib-devel
 BuildConflicts:	kdelibs
 BuildConflicts:	kdelibs-devel
-Requires:	%{name}-libs = %{version}-%{release}
 Requires:	QtCore >= %{qtver}
-%{?with_apidocs:Requires:	docbook-dtd412-xml}
-%{?with_apidocs:Requires:	docbook-dtd42-xml}
-%{?with_apidocs:Requires:	docbook-style-xsl}
 Requires:	hicolor-icon-theme
 Requires:	kde-common-dirs >= 0.5
 Requires:	setup >= 2.4.6-7
@@ -108,8 +93,9 @@
 Requires:	xorg-app-iceauth
 Suggests:	kde4-icons
 Provides:	%{name}-shared
-Obsoletes:	kde4-kdelibs-experimental
-Obsoletes:	kde4-kdelibs-shared
+Obsoletes:	%{name}-experimental
+Obsoletes:	%{name}-libs
+Obsoletes:	%{name}-shared
 Obsoletes:	kdelibs4
 Conflicts:	kdelibs
 Conflicts:	kdelibs4
@@ -166,17 +152,6 @@
 - kimgio (обробка зображень).
 - kspell (перевірка орфографії),
 
-%package libs
-Summary:	KDE libraries
-Summary(pl.UTF-8):	Biblioteki KDE
-Group:		X11/Libraries
-
-%description libs
-KDE libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki KDE.
-
 %package devel
 Summary:	kdelibs - header files and development documentation
 Summary(pl.UTF-8):	kdelibs - pliki nagłówkowe i dokumentacja do kdelibs
@@ -185,7 +160,6 @@
 Summary(uk.UTF-8):	Хедери та документація для компіляції програм KDE
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-libs = %{version}-%{release}
 Requires:	acl-devel
 Requires:	fam-devel
 Requires:	libart_lgpl-devel
@@ -217,25 +191,6 @@
 %description devel -l uk.UTF-8
 Цей пакет містить хедери, необхідні для компіляції програм для KDE.
 
-%package apidocs
-Summary:	API documentation
-Summary(pl.UTF-8):	Dokumentacja API
-Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	kttsd-apidocs
-
-%description apidocs
-Annotated reference of KDE libraries programming interface including:
-- class lists
-- class members
-- namespaces
-
-%description apidocs -l pl.UTF-8
-Dokumentacja interfejsu programowania bibliotek KDE z przypisami.
-Zawiera:
-- listy klas i ich składników
-- listę przestrzeni nazw (namespace)
-
 %prep
 %setup -q -n %{orgname}-%{version}%{snap}
 ##%setup -q -n %{orgname}-%{version}
@@ -286,11 +241,14 @@
 	$RPM_BUILD_ROOT%{_desktopdir}/kde4 \
 	$RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus \
 
+# DO NOT PACKAGE THIS FILE vvvv - use applnk
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications.menu
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -413,8 +371,6 @@
 %lang(en) %{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kioslave
 
-%files libs
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkde3support.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkde3support.so.?
 %attr(755,root,root) %{_libdir}/libkdecore.so.*.*
@@ -1048,18 +1004,15 @@
 %dir %{_includedir}/kunittest
 %{_includedir}/kunittest/*
 
-%if %{with apidocs}
-#%files apidocs
-#%defattr(644,root,root,755)
-#%{_kdedocdir}/en/%{name}*-apidocs
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157.2.6  2009/09/22 23:46:15  cactus
+- merged some changes from HEAD
+
 Revision 1.157.2.5  2009/09/22 11:39:51  cactus
 - up to 4.3.68
 - ghost symlinks for libs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.157.2.5&r2=1.157.2.6&f=u