FIX Packaging for experimental versions, minor fixes

1 files changed, 11 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1fab239..31fc111c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,10 @@ if(DISTRO)
     string(REGEX REPLACE "[.].*" "" DISTRO_BUILD_VER ${DISTRO})
     set(CPACK_PACKAGE_VERSION "${HARDINFO2_VERSION}-${DISTRO_BUILD_VER}")
     set(PACKAGE_DISTRO "${HARDINFO2_VERSION}-${DISTRO}")
+    if(${HARDINFO2_GTK3})
+    else()
+      message(FATAL_ERROR "Distro-Building not supported with GTK2!!")
+    endif()
 endif()
 #Put it together
 string(REPLACE " " "_" CPACK_PACKAGE_FILE_NAME "hardinfo${PACKAGE_DELIMITER}${PACKAGE_DISTRO}${PACKAGE_ARCHITECTURE}")
@@ -182,7 +186,7 @@ if (HARDINFO2_GTK3)
     pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.0 cairo>=1.0 cairo-png>=1.0 gthread-2.0>=2.10 gmodule-export-2.0>=2.10)
     add_definitions(-DGTK_DISABLE_SINGLE_INCLUDES)
 else()
-    message(STATUS "Building for GTK2")
+    message(STATUS "Building for GTK2 - (Deprecated - Please update your distro!!)")
     pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10)
 endif()
 
@@ -506,8 +510,10 @@ install(FILES pixmaps/hardinfo2.png
 SET(CPACK_PACKAGE_HOMEPAGE_URL "https://www.hardinfo2.org")
 if(${RPM})
     SET(CPACK_GENERATOR "RPM")
+    SET(PACKAGE_GTK2 "libgtk-2-0")
 else()
     SET(CPACK_GENERATOR "DEB")
+    SET(PACKAGE_GTK2 "libgtk2.0-0")
 endif()
 
 #RPM
@@ -515,7 +521,7 @@ SET(CPACK_RPM_PACKAGE_MAINTAINER "hwspeedy <hardinfo2@bigbear.dk>")
 SET(CPACK_RPM_PACKAGE_DESCRIPTION "Hardinfo2 is a small application that displays information about your hardware and operating system.  It has online benchmarking to check your machine performance against other machines.")
 SET(CPACK_RPM_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils")
 SET(CPACK_RPM_PACKAGE_LICENSE "GPL2+")
-SET(CPACK_RPM_PACKAGE_HOMEPAGE "https://github.com/hwspeedy/hardinfo2")
+SET(CPACK_RPM_PACKAGE_HOMEPAGE "https://github.com/hardinfo2/hardinfo2")
 if(HARDINFO2_LIBSOUP3)
     SET(PACKAGE_LS "libsoup (>=3.0)")
 else()
@@ -524,7 +530,7 @@ endif()
 if(HARDINFO2_GTK3)
     SET(PACKAGE_GTK "libgtk-3-0 (>=3.0)")
 else()
-    SET(PACKAGE_GTK "libgtk-2-0 (>=2.20)")
+    SET(PACKAGE_GTK "${PACKAGE_GTK2} (>=2.20)")
 endif()
 SET(CPACK_RPM_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib, ${PACKAGE_LS}, ${PACKAGE_GTK}, libglib2.0-0 (>=2.10)")
 
@@ -532,7 +538,7 @@ SET(CPACK_RPM_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib, ${PACKAGE_LS}, ${PACKAG
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "hwspeedy <hardinfo2@bigbear.dk>")
 SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Hardinfo2 is a small application that displays information about your hardware and operating system. It has online benchmarking to check your machine performance against other machines.")
 SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils")
-SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/hwspeedy/hardinfo2")
+SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/hardinfo2/hardinfo2")
 if(HARDINFO2_LIBSOUP3)
     SET(PACKAGE_LS "libsoup-3.0.0 (>=3.0)")
 else()
@@ -544,7 +550,7 @@ endif()
 if(HARDINFO2_GTK3)
     SET(PACKAGE_GTK "libgtk-3-0 (>=3.0)")
 else()
-    SET(PACKAGE_GTK "libgtk-2-0 (>=2.20)")
+    SET(PACKAGE_GTK "${PACKAGE_GTK2} (>=2.20)")
 endif()
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib1g, ${PACKAGE_LS}, ${PACKAGE_GTK}")