remove 32bit dnf from readme, fix packaging of header files and arch …

…names

CMakeLists.txt

@@ -21,12 +21,15 @@ if (BUILD_32)
        	set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
         MESSAGE(STATUS "Excluding 64bit library paths from search.")
        	set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
-	set(ARCH i686)
+	set(ARCH_RPM i686)
+        set(ARCH_DEB i386)
 elseif (BUILD_64)
         set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
-	set(ARCH amd64)
+	set(ARCH_DEB amd64)
+        set(ARCH_RM x86_64)
 else()
-	set(ARCH amd64)
+	set(ARCH_DEB amd64)
+        set(ARCH_RPM x86_64)
 endif()
 
 if (USE_MPIR)
@@ -56,7 +59,7 @@ if (WIN32)
 endif()
 
 install(TARGETS bncsutil RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-install(FILES src/bncsutil/bncsutil.h DESTINATION include/bncsutil)
+install(FILES ${HEADERS} DESTINATION include/bncsutil)
 
 #CPack configurtion
 SET(CPACK_GENERATOR "DEB" "RPM")
@@ -73,7 +76,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 SET(CPACK_DEBIAN_PACKAGE_SECTION "libs")
 SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/BNETDocs/bncsutil")
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]")
-SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH})
+SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH_DEB})
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgmp10")
 
 #RPM configuration
@@ -82,6 +85,6 @@ SET(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_RPM_PACKAGE_GROUP "${PROJECT_NAME}")
 SET(CPACK_RPM_PACKAGE_URL "https://github.com/BNETDocs/bncsutil")
 SET(CPACK_RPM_PACKAGE_REQUIRES "gmp")
-SET(CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCH})
+SET(CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCH_RPM})
 
 INCLUDE(CPack)

README.md

@@ -64,5 +64,4 @@ DEB and RPM repositories are maintained with best effort.
  2. If using dnf, make sure to import the public key: `rpm --import https://rpm.xpam.pl/rpm-pubkey.asc`
  3. Update and install: `yum update && yum install bncsutil` or dnf equivalent.
 
-### Fedora/CentOS (i686)
-`sudo dnf install bncsutil.i686`
+