diff --git a/dist/paho-cpp.spec b/dist/paho-cpp.spec
index f21e887d..66a835c7 100644
--- a/dist/paho-cpp.spec
+++ b/dist/paho-cpp.spec
@@ -4,40 +4,41 @@ Version:            1.6.0
 Release:            0%{?dist}
 License:            Eclipse Eclipse Public License 2.0 and Distribution License 1.0
 Group:              Development/Tools
-Source:             https://github.com/eclipse/paho.mqtt.cpp/archive/v%{version}.tar.gz
+Source:             https://github.com/eclipse/paho.mqtt.cpp/archive/v%{version}/%{name}-%{version}.tar.gz
 URL:                https://eclipse.org/paho/clients/cpp/
 BuildRequires:      cmake3
-BuildRequires:      gcc
+BuildRequires:      gcc-c++
 BuildRequires:      graphviz
 BuildRequires:      doxygen
 BuildRequires:      openssl-devel
 BuildRequires:      paho-c-devel
 Requires:           openssl
-Requires:           paho-c
+Requires:           paho-c >= 1.3.16
 
 
 %description
-The Paho MQTT CPP Client is a fully fledged MQTT client written in ANSI standard C++ 17.
+The Paho MQTT CPP Client is a full MQTT client written in ANSI standard C++ 17.
 
 
 %package devel
 Summary:            MQTT CPP Client development kit
-Group:              Development/Libraries
-Requires:           paho-cpp
+Requires:           %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-Development files and samples for the the Paho MQTT CPP Client.
+Development files for the the Paho MQTT CPP Client.
 
 
 %package devel-docs
 Summary:            MQTT CPP Client development kit documentation
-Group:              Development/Libraries
+BuildArch:          noarch
 
 %description devel-docs
-Development documentation files for the the Paho MQTT CPP Client.
+Development documentation and code samples for the the Paho MQTT CPP Client.
+
 
 %prep
-%autosetup -n paho-cpp-%{version}
+%autosetup -n paho.mqtt.cpp-%{version}
+sed -i'' 's|lib/cmake|%{_lib}/cmake|' cmake/CMakeLists.txt
 
 %build
 mkdir build.paho.cpp && cd build.paho.cpp
@@ -45,20 +46,38 @@ mkdir build.paho.cpp && cd build.paho.cpp
 make %{?_smp_mflags}
 
 %install
-cd build.paho.cpp
-make install DESTDIR=%{buildroot}
+%cmake_install
+
+mkdir -p %{buildroot}%{_docdir}/%{name}/samples/
+# put the samples into the documentation directory
+cp -a src/samples/*.cpp %{buildroot}%{_docdir}/%{name}/samples/
+# Put paho html docs in a paho subdirectory
+mv %{buildroot}%{_docdir}/html %{buildroot}%{_docdir}/%{name}/html
 
 %files
 %doc edl-v10 epl-v20
 %{_libdir}/*
 
 %files devel
-%{_bindir}/*
-%{_includedir}/*
+%license edl-v10 epl-v10
+%{_includedir}/mqtt
+%{_libdir}/libpaho-mqttpp3.so
+%{_libdir}/cmake/PahoMqttCpp
 
 %files devel-docs
-%{_datadir}/*
+%license edl-v10 epl-v10
+%doc CHANGELOG.md CONTRIBUTING.md README.md
+%doc %{_docdir}/%{name}
 
 %changelog
+* Thu Jun 03 2021 Joshua Clayton <joshua.clayton@3deolidar.com> - 1.2.0
+- Update for version 1.2.0
+- Fix many details for inclusion in fedora
+
+* Tue Dec 08 2020 Joshua Clayton <joshua.clayton@3deolidar.com> - 1.1
+- Update and patch for 1.1
+- Put the html documenation into an appropriate paho-cpp directory
+- instead of compiling the samples, put the cpp files in with documentation
+
 * Wed Oct 11 2017 Julien Courtat <julien.courtat@aqsacom.com> - 1.0.0
 - Initial packaging