SPECS: kdelibs4.spec - bconds cleanup - -devel R: just -libs, not ...

[qboosh]

Author: qboosh                       Date: Sat Jan 19 13:41:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bconds cleanup
- -devel R: just -libs, not base

---- Files affected:
SPECS:
   kdelibs4.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/kdelibs4.spec
diff -u SPECS/kdelibs4.spec:1.12 SPECS/kdelibs4.spec:1.13
--- SPECS/kdelibs4.spec:1.12	Fri Jan 18 22:02:22 2008
+++ SPECS/kdelibs4.spec	Sat Jan 19 14:41:52 2008
@@ -5,12 +5,7 @@
 # Conditional build:
 %bcond_without	alsa		# build without ALSA support
 %bcond_without	apidocs		# don't prepare API documentation
-%bcond_without  autoreqdep	# don't care about package name deps generated by rpm
-%bcond_without	kerberos5	# disable kerberos
 %bcond_with	verbose		# verbose build
-%bcond_without	hidden_visibility	# pass '--fvisibility=hidden'
-					# & '--fvisibility-inlines-hidden'
-					# to g++
 #
 %define		_state		stable
 
@@ -99,11 +94,7 @@
 BuildRequires:	sysstat
 BuildRequires:	utempter-devel
 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:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	QtCore >= 4.2.0
 Requires:	docbook-dtd412-xml
 Requires:	docbook-dtd42-xml
@@ -192,7 +183,7 @@
 Summary(ru.UTF-8):	Хедеры и документация для компилляции программ KDE
 Summary(uk.UTF-8):	Хедери та документація для компіляції програм KDE
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	acl-devel
 Requires:	fam-devel
 Requires:	libart_lgpl-devel
@@ -364,8 +355,6 @@
 
 # nepomuk ???
 %attr(755,root,root) %{_bindir}/nepomuk-rcgen
-%attr(755,root,root) %{_libdir}/libnepomuk.so.4.0.0
-%attr(755,root,root) %{_libdir}/libnepomuk.so.4
 %dir %{_datadir}/apps/nepomuk
 %{_datadir}/apps/nepomuk/ontologies
 %dir %{_datadir}/apps/nepomuk/pics
@@ -461,6 +450,8 @@
 %attr(755,root,root) %{_libdir}/libkfile.so.*
 %attr(755,root,root) %{_libdir}/libkrosscore.so.*
 %attr(755,root,root) %{_libdir}/libkrossui.so.*
+%attr(755,root,root) %{_libdir}/libnepomuk.so.4.0.0
+%attr(755,root,root) %{_libdir}/libnepomuk.so.4
 %attr(755,root,root) %{_libdir}/libphonon.so.*
 %attr(755,root,root) %{_libdir}/libphononexperimental.so.*
 %attr(755,root,root) %{_libdir}/libkdeinit4_kbuildsycoca4.so
@@ -487,7 +478,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kconfig_compiler
-%{_datadir}/apps/cmake
 %attr(755,root,root) %{_libdir}/libkde3support.so
 %attr(755,root,root) %{_libdir}/libkdecore.so
 %attr(755,root,root) %{_libdir}/libkdefakes.so
@@ -519,6 +509,7 @@
 %attr(755,root,root) %{_libdir}/libkrossui.so
 %attr(755,root,root) %{_libdir}/libphononexperimental.so
 %{_includedir}/*
+%{_datadir}/apps/cmake
 
 %if %{with apidocs}
 %files apidocs
@@ -532,6 +523,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008-01-19 13:41:52  qboosh
+- bconds cleanup
+- -devel R: just -libs, not base
+
 Revision 1.12  2008-01-18 21:02:22  shadzik
 - own /usr/share/autostart
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs4.spec?r1=1.12&r2=1.13&f=u