rpms/kde-filesystem/devel kde-filesystem.spec, 1.4.2.11, 1.4.2.12 macros.kde4, 1.1.2.8, 1.1.2.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec macros.kde4 
Log Message:
* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
- simplify macros a bit



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -r1.4.2.11 -r1.4.2.12
--- kde-filesystem.spec	14 Aug 2007 18:17:59 -0000	1.4.2.11
+++ kde-filesystem.spec	16 Aug 2007 16:03:30 -0000	1.4.2.12
@@ -1,11 +1,11 @@
 %define _kde4_prefix %_prefix
 %define _kde4_sysconfdir %_sysconfdir
-%define _kde4_libdir %_kde4_prefix/%_lib/kde4
-%define _kde4_datadir %_kde4_prefix/share
-%define _kde4_sharedir %_kde4_prefix/share/kde4
-%define _kde4_iconsdir %_kde4_prefix/share/icons
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
 %define _kde4_configdir %_kde4_sharedir/config
-%define _kde4_appsdir %_kde4_sharedir/apps
+%define _kde4_appsdir %_kde4_sharedir/kde4/apps
 %define _kde4_docdir %_kde4_prefix/share/doc
 %define _kde4_bindir %_kde4_prefix/bin
 %define _kde4_sbindir %_kde4_prefix/sbin
@@ -16,7 +16,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 3.92
-Release: 7 
+Release: 8
 
 Group: System Environment/Base
 License: Public Domain
@@ -108,12 +108,12 @@
 cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
 %%_kde4_prefix %%_prefix
 %%_kde4_sysconfdir %%_sysconfdir
-%%_kde4_libdir %%_kde4_prefix/%%_lib/kde4
-%%_kde4_datadir %%_kde4_prefix/share
-%%_kde4_sharedir %%_kde4_prefix/share/kde4
-%%_kde4_iconsdir %%_kde4_prefix/share/icons
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
 %%_kde4_configdir %%_kde4_sharedir/config
-%%_kde4_appsdir %%_kde4_sharedir/apps
+%%_kde4_appsdir %%_kde4_sharedir/kde4/apps
 %%_kde4_docdir %_kde4_prefix/share/doc
 %%_kde4_bindir %%_kde4_prefix/bin
 %%_kde4_sbindir %%_kde4_prefix/sbin
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
 - kde4-macros(api), %%_kde4_macros_api
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/Attic/macros.kde4,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- macros.kde4	9 Aug 2007 13:46:58 -0000	1.1.2.8
+++ macros.kde4	16 Aug 2007 16:03:30 -0000	1.1.2.9
@@ -1,7 +1,10 @@
 
+# api = 1
+# initial try, including only items that vary from defaults
+
 %cmake_kde4 \
-  QTDIR="%_qt4_prefix" ; export QTDIR ; \
-  PATH="%_qt4_prefix/bin:$PATH" ; export PATH ; \
+  QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
+  PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
@@ -11,14 +14,6 @@
   %endif \
   -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
   -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
-  -DCMAKE_INSTALL_LIBDIR=%{_kde4_libdir} \\\
   -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
-  -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
   -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
-  -DDATA_INSTALL_DIR=%{_kde4_sharedir}/apps \\\
-  -DCONFIG_INSTALL_DIR=%{_kde4_configdir} \\\
-  -DKCFG_INSTALL_DIR=%{_kde4_sharedir}/config.kcfg \\\
-  -DTEMPLATES_INSTALL_DIR=%{_kde4_sharedir}/templates \\\
-  -DLOCALE_INSTALL_DIR=%{_kde4_sharedir}/locale \\\
-  -DDBUS_SERVICES_INSTALL_DIR=%{_datadir}/dbus-1/services \\\
-  -DDBUS_INTERFACES_INSTALL_DIR=%{_datadir}/dbus-1/interfaces
+  -DDATA_INSTALL_DIR=%{_kde4_appsdir}