SPECS: kdelibs4.spec - package libkdeinit4I to proper dir, fix htm...

[glen]

Author: glen                         Date: Sun Jan 13 00:35:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package libkdeinit4I to proper dir, fix htmldocdirs

---- Files affected:
SPECS:
   kdelibs4.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/kdelibs4.spec
diff -u SPECS/kdelibs4.spec:1.8 SPECS/kdelibs4.spec:1.9
--- SPECS/kdelibs4.spec:1.8	Fri Jan 11 09:52:54 2008
+++ SPECS/kdelibs4.spec	Sun Jan 13 01:35:45 2008
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - make possible to install with kde3
 #
 # Conditional build:
 %bcond_without	alsa		# build without ALSA support
@@ -112,6 +114,12 @@
 Requires:	xorg-app-iceauth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_kde_prefix		%{_prefix}
+%define		_kde_libdir		%{_libdir}
+%define		_kde_share_dir	%{_datadir}
+%define		_kde_html_dir	%{_kdedocdir}
+%define		_kde_config_dir	%{_datadir}/config
+
 %define		_noautoreq	libtool(.*)
 
 # confuses OpenEXR detection
@@ -280,9 +288,17 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DLIB_INSTALL_DIR=%{_libdir} \
+	-DCMAKE_INSTALL_PREFIX=%{_kde_prefix} \
+	-DCMAKE_BUILD_TYPE=%{_kde_build_type} \
+	-DLIB_INSTALL_DIR=%{_kde_libdir} \
+	-DCONFIG_INSTALL_DIR=%{_kde_config_dir} \
 	-DSYSCONF_INSTALL_DIR=/etc \
+	-DDATA_INSTALL_DIR=%{_kde_share_dir}/apps \
+	-DKCFG_INSTALL_DIR=%{_kde_share_dir}/config.kcfg \
+	-DMIME_INSTALL_DIR=/nogo \
+	-DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \
+	-DHTML_INSTALL_DIR=%{_kde_html_dir} \
+	-DLIB_SUFFIX=$(lib=%{_lib}; echo ${lib#lib}) \
 	../
 
 %{__make}
@@ -291,9 +307,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd build
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir} \
-	kde_libs_htmldir=%{_kdedocdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d \
 	$RPM_BUILD_ROOT/etc/security \
@@ -323,9 +337,9 @@
 
 %files
 %defattr(644,root,root,755)
-%dir %{_docdir}/HTML
-%dir %{_docdir}/HTML/en
-%lang(en) %{_docdir}/HTML/en/common
+%dir %{_kdedocdir}
+%dir %{_kdedocdir}/en
+%lang(en) %{_kdedocdir}/en/common
 %ghost /etc/security/fileshare.conf
 %attr(755,root,root) %{_bindir}/kde4automoc
 %attr(755,root,root) %{_bindir}/checkXML
@@ -355,7 +369,7 @@
 %{_datadir}/apps/nepomuk/ontologies
 %dir %{_datadir}/apps/nepomuk/pics
 %{_datadir}/apps/nepomuk/pics/rating.png
-%{_docdir}/HTML/en/sonnet
+%{_kdedocdir}/en/sonnet
 %{_mandir}/man1/checkXML.1*
 %{_mandir}/man1/kde4-config.1*
 %{_mandir}/man7/kdeoptions.7*
@@ -446,6 +460,11 @@
 %attr(755,root,root) %{_libdir}/libkrossui.so.*
 %attr(755,root,root) %{_libdir}/libphonon.so.*
 %attr(755,root,root) %{_libdir}/libphononexperimental.so.*
+%attr(755,root,root) %{_libdir}/libkdeinit4_kbuildsycoca4.so
+%attr(755,root,root) %{_libdir}/libkdeinit4_kded4.so
+%attr(755,root,root) %{_libdir}/libkdeinit4_kconf_update.so
+%attr(755,root,root) %{_libdir}/libkdeinit4_kio_http_cache_cleaner.so
+%attr(755,root,root) %{_libdir}/libkdeinit4_klauncher.so
 
 %dir %{_libdir}/kde4
 %attr(755,root,root) %{_libdir}/kde4/*.so
@@ -466,11 +485,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kconfig_compiler
 %{_datadir}/apps/cmake
-%attr(755,root,root) %{_libdir}/libkdeinit4_kbuildsycoca4.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_kconf_update.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_kded4.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_kio_http_cache_cleaner.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_klauncher.so
 %attr(755,root,root) %{_libdir}/libkde3support.so
 %attr(755,root,root) %{_libdir}/libkdecore.so
 %attr(755,root,root) %{_libdir}/libkdefakes.so
@@ -515,6 +529,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008-01-13 00:35:45  glen
+- package libkdeinit4I to proper dir, fix htmldocdirs
+
 Revision 1.8  2008-01-11 08:52:54  pascalek
 - updated to 4.0.0
 
================================================================

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