From 1b14d99d8e9669fd3d0cc44727c212ada68e0b57 Mon Sep 17 00:00:00 2001
From: rayvd <rayvd@fedoraproject.org>
Date: Jan 29 2008 17:59:03 +0000
Subject: Addresses bz #430502


---

diff --git a/.cvsignore b/.cvsignore
index 70d5d99..039802a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-remind-03.01.03.tar.gz
+remind-03.01.02.tar.gz
diff --git a/remind.spec b/remind.spec
index 7974227..9503622 100644
--- a/remind.spec
+++ b/remind.spec
@@ -1,6 +1,6 @@
 Name:           remind
-Version:        03.01.03
-Release:        1%{?dist}
+Version:        03.01.02
+Release:        3%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
@@ -36,7 +36,7 @@ end for Remind using Tcl/Tk.
 # Convert remind man page to UTF8
 pushd man
 iconv -c -t UTF8 remind.1 > remind.1.utf8
-mv remind.1.utf8 remind.1
+%{__mv} remind.1.utf8 remind.1
 popd
 %patch0 -p1
 pushd www
@@ -45,7 +45,7 @@ popd
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %check
 cd src
@@ -60,10 +60,14 @@ if ! make test; then
 fi
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 # This preserves timestamps.
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
 
+# Copy rem2html to /usr/bin.  Leave in the www directory also as it is used
+# by the demo program there.
+%{__install} -m 755 -p www/rem2html $RPM_BUILD_ROOT/usr/bin/
+
 # Install desktop stuff.
 desktop-file-install --vendor "fedora"             \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
@@ -71,10 +75,11 @@ desktop-file-install --vendor "fedora"             \
   %{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/rem2html
 %{_bindir}/cm2rem.tcl
 %{_bindir}/rem2ps
 %{_bindir}/remind
@@ -93,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
-* Sun Jan 20 2008 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.03-1
-- Updated to version 03.01.03
+* Mon Jan 28 2008 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.02-3
+- Copied rem2html to /usr/bin per bz #430502
+- Using a few more macros in spec file
 
 * Thu Sep 19 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.02-2
 - Added tcllib requires per bz #290761
diff --git a/sources b/sources
index 5b29e05..b27ba4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32fa5390910829db16f1f126a0120e94  remind-03.01.03.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz