From 8d6b7f6608ca70740f0066c7a446e9377fac1fc8 Mon Sep 17 00:00:00 2001
From: Robert Xu <robxu9@gmail.com>
Date: Sat, 13 Aug 2011 16:07:59 -0400
Subject: revise arts.spec to match new macros.tde

---
 opensuse/arts/arts.spec            | 4 ++--
 opensuse/tde-filesystem/macros.tde | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/opensuse/arts/arts.spec b/opensuse/arts/arts.spec
index c9eb76281..8e7fb26cd 100644
--- a/opensuse/arts/arts.spec
+++ b/opensuse/arts/arts.spec
@@ -106,10 +106,10 @@ CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d=bu
 # broken automake ?
 #make %{?jobs:-j%jobs}
 
-%make_jobs
+%make_tde -d=build
 
 %install
-%tde_makeinstall
+%makeinstall_tde -d=build
 %ifarch x86_64
 mkdir -p $RPM_BUILD_ROOT/%{_tde_libdir}
 ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_libdir}/mcop
diff --git a/opensuse/tde-filesystem/macros.tde b/opensuse/tde-filesystem/macros.tde
index 4a26c393d..ed9706918 100644
--- a/opensuse/tde-filesystem/macros.tde
+++ b/opensuse/tde-filesystem/macros.tde
@@ -47,8 +47,6 @@
  
 %_tde_build_type release
  
-%tde_makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install
- 
 %cmake_tde(d:) \
   export CFLAGS=$RPM_OPT_FLAGS \
   export CXXFLAGS=$RPM_OPT_FLAGS \
@@ -94,7 +92,7 @@
   bdir=. \
   %{-d:dir=%{-d*} \
   bdir=.. } \
-  make DESTDIR=%{buildroot} install VERBOSE=1 \
+  make DESTDIR=%{?buildroot:%{buildroot}} install VERBOSE=1 \
   if [ "$bdir" == ".." ]; then \
        cd .. \
   fi \
-- 
cgit v1.2.1