rpms/kde-filesystem/devel kde-filesystem.spec, 1.4.2.2, 1.4.2.3 macros.kde4, 1.1.2.4, 1.1.2.5

[Than Ngo (than)]

Author: than

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

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec macros.kde4 
Log Message:
fix macros



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- kde-filesystem.spec	7 Aug 2007 17:13:33 -0000	1.4.2.2
+++ kde-filesystem.spec	9 Aug 2007 10:21:24 -0000	1.4.2.3
@@ -34,6 +34,7 @@
       -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/shutdown \
       -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/kdm \
       -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_libdir}/kde4 \
       -p $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps \
       -p $RPM_BUILD_ROOT%{_datadir}/autostart \
@@ -77,6 +78,7 @@
 %{_prefix}/env/
 %{_prefix}/shutdown/
 %{_sysconfdir}/kde/
+%{_libdir}/kde4
 %{_datadir}/applications/kde4/
 %{_datadir}/kde4/apps/
 %{_datadir}/kde4/config/


Index: macros.kde4
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/Attic/macros.kde4,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- macros.kde4	8 Aug 2007 14:05:58 -0000	1.1.2.4
+++ macros.kde4	9 Aug 2007 10:21:24 -0000	1.1.2.5
@@ -1,10 +1,11 @@
 %_kde_prefix %_prefix
 %_kde_sysconfdir %_sysconfdir
-%_kde_libdir %_kde_prefix/%_lib
-%_kde_share_dir %_kde_prefix/share/kde4
+%_kde_libdir %_kde_prefix/%_lib/kde4
+%_kde_datadir %_kde_prefix/share
+%_kde_sharedir %_kde_prefix/share/kde4
 %_kde_iconsdir %_kde_prefix/share/icons
-%_kde_configdir %_kde_share_dir/config
-%_kde_appsdir %_kde_share_dir/apps
+%_kde_configdir %_kde_sharedir/config
+%_kde_appsdir %_kde_sharedir/apps
 %_kde_docdir %_kde_prefix/share/doc
 %_kde_bindir %_kde_prefix/bin
 %_kde_sbindir %_kde_prefix/sbin
@@ -27,8 +28,10 @@
   -DSYSCONF_INSTALL_DIR=%_kde_sysconfdir \\\
   -DINCLUDE_INSTALL_DIR=%_kde_includedir \\\
   -DLIB_INSTALL_DIR=%_kde_libdir \\\
-  -DDATA_INSTALL_DIR=%_kde_share_dir/apps \\\
-  -DKCFG_INSTALL_DIR=%_kde_share_dir/config.kcfg \\\
-  -DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \\\
+  -DDATA_INSTALL_DIR=%_kde_sharedir/apps \\\
+  -DCONFIG_INSTALL_DIR=%_kde_configdir \\\
+  -DKCFG_INSTALL_DIR=%_kde_sharedir/config.kcfg \\\
+  -DTEMPLATES_INSTALL_DIR=%{_kde_sharedir}/templates \\\
+  -DLOCALE_INSTALL_DIR=%{_kde_sharedir}/locale \\\
   -DDBUS_SERVICES_INSTALL_DIR=%_datadir/dbus-1/services \\\
   -DDBUS_INTERFACES_INSTALL_DIR=%_datadir/dbus-1/interfaces