SPECS (DEVEL): kde4-kdelibs.spec - disable macros usage, can live with defa...

[glen]

Author: glen                         Date: Mon Dec  8 17:19:05 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- disable macros usage, can live with defaults (would be out of sync anyway if changed)

---- Files affected:
SPECS:
   kde4-kdelibs.spec (1.109.2.42 -> 1.109.2.43) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdelibs.spec
diff -u SPECS/kde4-kdelibs.spec:1.109.2.42 SPECS/kde4-kdelibs.spec:1.109.2.43
--- SPECS/kde4-kdelibs.spec:1.109.2.42	Mon Dec  8 13:36:57 2008
+++ SPECS/kde4-kdelibs.spec	Mon Dec  8 18:19:00 2008
@@ -110,14 +110,6 @@
 Conflicts:	kdelibs4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_defaultdocdir	%{_prefix}/share/doc
-%define		_iconsdir	%{_prefix}/share/icons
-%define		_kde_prefix	%{_prefix}
-%define		_kde_libdir	%{_libdir}
-%define		_kde_share_dir	%{_datadir}
-%define		_kde_html_dir	%{_kdedocdir}
-%define		_kde_config_dir	%{_datadir}/config
-
 # confuses OpenEXR detection
 %undefine	configure_cache
 
@@ -248,16 +240,15 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_kde_prefix} \
-	-DCMAKE_BUILD_TYPE=%{_kde_build_type} \
-	-DLIB_INSTALL_DIR=%{_kde_libdir} \
-	-DCONFIG_INSTALL_DIR=%{_kde_config_dir} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
+	-DCONFIG_INSTALL_DIR=%{_datadir}/config \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-	-DDATA_INSTALL_DIR=%{_kde_share_dir}/apps \
-	-DKCFG_INSTALL_DIR=%{_kde_share_dir}/config.kcfg \
+	-DDATA_INSTALL_DIR=%{_datadir}/apps \
+	-DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \
 	-DMIME_INSTALL_DIR=/nogo \
-	-DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \
-	-DHTML_INSTALL_DIR=%{_kde_html_dir} \
+	-DTEMPLATES_INSTALL_DIR=%{_datadir}/templates \
+	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -1013,6 +1004,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109.2.43  2008/12/08 17:19:00  glen
+- disable macros usage, can live with defaults (would be out of sync anyway if changed)
+
 Revision 1.109.2.42  2008/12/08 12:36:57  paszczus
 - updated to 4.1.82
 
================================================================

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