From a55ee6b94d8c2fbd5ae32d119bb4170c8e00a0f6 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: May 22 2010 01:06:50 +0000
Subject: - Do not use RPM macros for basic commands in the spec file


---

diff --git a/calendar.spec b/calendar.spec
index 01021d1..22dc3c9 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 9.%{alphatag}%{?dist}
+Release: 10.%{alphatag}%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -20,7 +20,7 @@ Source2: export-calendar-source.sh
 Patch0:  %{name}-1.25-linux.patch
 Patch1:  %{name}-1.25-coding.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 %description
 The OpenBSD calendar command is a reminder utility.  Calendar reads
@@ -33,25 +33,25 @@ week.
 %setup -q -n %{name}-%{version}-%{alphatag}
 %patch0 -p1
 %patch1 -p1
-%{__cp} %{SOURCE1} Makefile
+cp %{SOURCE1} Makefile
 
 for c in calendars/*.*/* ; do
-    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    fromcode="$(grep '^LANG=' "$c" | sed 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
     if [ ! -z "$fromcode" ]; then
         iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
-        %{__mv} "$c.conv" "$c"
+        mv "$c.conv" "$c"
     fi
 done
 
 %build
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -60,6 +60,9 @@ done
 %{_datadir}/calendar
 
 %changelog
+* Fri May 21 2010 David Cantrell <dcantrell@redhat.com> - 1.25-10.20091114cvs
+- Do not use RPM macros for basic commands in the spec file
+
 * Wed Feb 24 2010 David Cantrell <dcantrell@redhat.com> - 1.25-9.20091114cvs
 - Add missing parens around srandom() and random() calls