summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstwo <stwo>2010-12-17 17:57:45 (GMT)
committerstwo <stwo>2010-12-17 17:57:45 (GMT)
commit7b4dabd49125428008c1944a7e590cd94475ef9a (patch)
tree8f7dbec584b3e0fa78d636f01ec6e453b5e73f8c
parent2136011bcc829e697c8671b58ccc16bf7b52e87a (diff)
downloadtk-7b4dabd49125428008c1944a7e590cd94475ef9a.zip
tk-7b4dabd49125428008c1944a7e590cd94475ef9a.tar.gz
tk-7b4dabd49125428008c1944a7e590cd94475ef9a.tar.bz2
Use 'rpmbuild', not 'rpm' [Bug 2537626].
-rw-r--r--ChangeLog4
-rw-r--r--unix/Makefile.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f5ec9b..2672970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-17 Stuart Cassoff <stwo@users.sourceforge.net>
+
+ * unix/Makefile.in: Use 'rpmbuild', not 'rpm' [Bug 2537626].
+
2010-12-17 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkMain.c: refactor isatty() function for Windows.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index f783da5..1810824 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.171 2010/12/16 01:55:02 stwo Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.172 2010/12/17 17:57:45 stwo Exp $
# Current Tk version; used in various names.
@@ -1493,13 +1493,13 @@ checkexports: $(TK_LIB_FILE)
# system.
#
-rpm: all /bin/rpm
+rpm: all
rm -f THIS.TCL.SPEC
echo "%define _builddir `pwd`" > THIS.TK.SPEC
echo "%define _rpmdir `pwd`/RPMS" >> THIS.TK.SPEC
cat tk.spec >> THIS.TK.SPEC
mkdir -p RPMS/i386
- rpm -bb THIS.TK.SPEC
+ rpmbuild -bb THIS.TK.SPEC
mv RPMS/i386/*.rpm .
rm -rf RPMS THIS.TK.SPEC