rpms/kde-filesystem/F-7 kde-filesystem.spec, 1.7, 1.8 macros.kde4, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556/F-7

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
sync w/devel, prep for kde-4.0.3 update



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-7/kde-filesystem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde-filesystem.spec	28 Mar 2008 12:08:52 -0000	1.7
+++ kde-filesystem.spec	16 Apr 2008 13:23:43 -0000	1.8
@@ -1,6 +1,7 @@
 %define _kde4_prefix %_prefix
 %define _kde4_sysconfdir %_sysconfdir
 %define _kde4_libdir %_libdir
+%define _kde4_libexecdir %_libexecdir/kde4
 %define _kde4_datadir %_datadir
 %define _kde4_sharedir %_datadir
 %define _kde4_iconsdir %_kde4_sharedir/icons
@@ -10,13 +11,13 @@
 %define _kde4_bindir %_kde4_prefix/bin
 %define _kde4_sbindir %_kde4_prefix/sbin
 %define _kde4_includedir %_kde4_prefix/include/kde4
-%define _kde4_debug RelWithDebInfo
-%define _kde4_macros_api 1
+%define _kde4_buildtype FEDORA 
+%define _kde4_macros_api 2
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
-Version: 4 
-Release: 9%{?dist}
+Version: 4
+Release: 14%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -78,7 +79,7 @@
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
       -p $RPM_BUILD_ROOT%{_kde4_includedir} \
-      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
       -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
       -p $RPM_BUILD_ROOT%{_kde4_appsdir}/color-schemes \
@@ -115,6 +116,7 @@
 %%_kde4_prefix %%_prefix
 %%_kde4_sysconfdir %%_sysconfdir
 %%_kde4_libdir %%_libdir
+%%_kde4_libexecdir %%_libexecdir/kde4
 %%_kde4_datadir %%_datadir
 %%_kde4_sharedir %%_datadir
 %%_kde4_iconsdir %%_kde4_sharedir/icons
@@ -124,8 +126,8 @@
 %%_kde4_bindir %%_kde4_prefix/bin
 %%_kde4_sbindir %%_kde4_prefix/sbin
 %%_kde4_includedir %%_kde4_prefix/include/kde4
-%%_kde4_debug RelWithDebInfo
-%%_kde4_macros_api 1
+%%_kde4_buildtype FEDORA
+%%_kde4_macros_api 2
 EOF
 cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
 
@@ -159,7 +161,7 @@
 # KDE4
 %config /etc/rpm/macros.kde4
 %{_kde4_sysconfdir}/kde4/
-%{_kde4_libdir}/
+%{_kde4_libexecdir}/
 %{_kde4_includedir}/
 %{_kde4_datadir}/applications/kde4/
 %{_kde4_appsdir}/
@@ -178,6 +180,22 @@
 
 
 %changelog
+* Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-14
+- don't define %%{_kde4_debug} in macros.kde4 anymore
+
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4-13
+- define %%{_kde4_buildtype} in macros.kde4 too
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-12
+- actually define %%{_kde4_libexecdir} in macros.kde4
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-11
+- add %%{_kde4_libexecdir}, set LIBEXEC_INSTALL_DIR to it
+- don't own %%{_kde4_libdir} which is just %%{_libdir}
+
+* Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> 4-10
+- macros.kde4: _kde4_buildtype=FEDORA
+
 * Fri Mar 28 2008 Than Ngo <than at redhat.com>  4-9
 - internal services shouldn't be displayed in menu, bz#321771
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-7/macros.kde4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- macros.kde4	10 Jan 2008 03:51:05 -0000	1.3
+++ macros.kde4	16 Apr 2008 13:23:43 -0000	1.4
@@ -1,5 +1,5 @@
 
-# api = 1
+# api = 2
 # initial try, including only items that vary from defaults
 #
 
@@ -16,9 +16,10 @@
     -DLIB_SUFFIX=64 \\\
   %endif \
   %{?_cmake_skip_rpath} \\\
-  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
+  -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
   -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
   -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
   -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
   -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
+  -DLIBEXEC_INSTALL_DIR=%{_kde4_libexecdir} \\\
   -DDATA_INSTALL_DIR=%{_kde4_appsdir}