Fedora Core->Fedora; yum->dnf.

Closes 18426 and 18459.

diff --git a/acinclude.m4 b/acinclude.m4
index 72593881ed8cdfdaf4e5608e4dd5dd30eb473d26..7b1aab2f990f1f22f8218425860ee75b19f8e4d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -109,7 +109,7 @@ if test -f /etc/debian_version && test x"$tor_$1_$2_debian" != x; then
   fi 
 fi
 if test -f /etc/fedora-release && test x"$tor_$1_$2_redhat" != x; then
-  AC_WARN([On Fedora Core, you can install$h $1 using "yum install $tor_$1_$2_redhat"])
+  AC_WARN([On Fedora, you can install$h $1 using "dnf install $tor_$1_$2_redhat"])
   if test x"$tor_$1_$2_redhat" != x"$tor_$1_devpkg_redhat"; then 
     AC_WARN([   You will probably need to install $tor_$1_devpkg_redhat too.])
   fi 

diff --git a/changes/bug18426_18459 b/changes/bug18426_18459
new file mode 100644 (file)
index 0000000..9059d6e
--- /dev/null
+++ b/changes/bug18426_18459
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Change build messages to refer to "Fedora" instead of "Fedora Core",
+      and "dnf" instead of "yum". Closes tickets 18459 and 18426.
+      Patches from "icanhasaccount" and "cypherpunks".

diff --git a/doc/contrib/tor-rpm-creation.txt b/doc/contrib/tor-rpm-creation.txt
index a03891e2b9c400ba91717986328c01cc2b0be6a6..9c4e05764ed1253ea7e8bbc6f644bba39a5e9932 100644 (file)
--- a/doc/contrib/tor-rpm-creation.txt
+++ b/doc/contrib/tor-rpm-creation.txt
@@ -42,7 +42,7 @@ Here's a workaround:
 Before even building the source RPM, install fedora-packager and instruct
 the build system to use rpmbuild-md5 like this:
 
-yum install fedora-packager
+dnf install fedora-packager
 export RPMBUILD=rpmbuild-md5
 
 Then proceed as usual to create the source RPM and binary RPMs: