rpms/kde-filesystem/devel kde-filesystem.spec, 1.4.2.4, 1.4.2.5 macros.kde4, 1.1.2.5, 1.1.2.6

[Rex Dieter (rdieter)]

Author: rdieter

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

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



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- kde-filesystem.spec	9 Aug 2007 11:18:58 -0000	1.4.2.4
+++ kde-filesystem.spec	9 Aug 2007 12:50:13 -0000	1.4.2.5
@@ -9,8 +9,8 @@
 BuildArch: noarch
 
 # teamnames (locales) borrowed from kde-i18n packaging
-Source: macros.kde4
 Source1: teamnames
+Source2: macros.kde4
 
 Requires:  filesystem
 
@@ -67,7 +67,8 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
-install %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT %{name}.list


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/Attic/macros.kde4,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- macros.kde4	9 Aug 2007 10:21:24 -0000	1.1.2.5
+++ macros.kde4	9 Aug 2007 12:50:13 -0000	1.1.2.6
@@ -1,37 +1,37 @@
-%_kde_prefix %_prefix
-%_kde_sysconfdir %_sysconfdir
-%_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_sharedir/config
-%_kde_appsdir %_kde_sharedir/apps
-%_kde_docdir %_kde_prefix/share/doc
-%_kde_bindir %_kde_prefix/bin
-%_kde_sbindir %_kde_prefix/sbin
-%_kde_includedir %_kde_prefix/include
-%_kde_debug RelWithDebInfo
+%_kde4_prefix %_prefix
+%_kde4_sysconfdir %_sysconfdir
+%_kde4_libdir %_kde_prefix/%_lib/kde4
+%_kde4_datadir %_kde_prefix/share
+%_kde4_sharedir %_kde_prefix/share/kde4
+%_kde4_iconsdir %_kde_prefix/share/icons
+%_kde4_configdir %_kde_sharedir/config
+%_kde4_appsdir %_kde_sharedir/apps
+%_kde4_docdir %_kde_prefix/share/doc
+%_kde4_bindir %_kde_prefix/bin
+%_kde4_sbindir %_kde_prefix/sbin
+%_kde4_includedir %_kde_prefix/include
+%_kde4_debug RelWithDebInfo
 
-%kde4_cmake \
+%cmake_kde4 \
   QTDIR="%_qt4_prefix" ; export QTDIR ; \
   PATH="%_qt4_prefix/bin:$PATH" ; export PATH ; \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  cmake \\\
-  %if "%{_lib}" != "lib" \
+  %{__cmake} \\\
+  %if "%{_lib}" == "lib64" \
     -DLIB_SUFFIX=64 \\\
   %endif \
-  -DCMAKE_BUILD_TYPE=%_kde_debug \\\
-  -DCMAKE_INSTALL_PREFIX=%_kde_prefix \\\
-  -DCMAKE_INSTALL_LIBDIR=%_kde_libdir \\\
-  -DSYSCONF_INSTALL_DIR=%_kde_sysconfdir \\\
-  -DINCLUDE_INSTALL_DIR=%_kde_includedir \\\
-  -DLIB_INSTALL_DIR=%_kde_libdir \\\
-  -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
+  -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