Merge updates/NFSE-4218-rpm-conflict-opt-hse-bin-171

hse-project · May 20, 2020 · 0a1bfa9 · 0a1bfa9
2 parents 315b9cc + ef4f5c0
commit 0a1bfa9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -431,10 +431,9 @@ set( CPACK_RPM_PACKAGE_GROUP "Unspecified" )
 set( CPACK_RPM_PACKAGE_VENDOR "Unspecified" )
 
 
-#
 # We don't want to claim ownership of these directories, lest there be
-# conflicts.
-#
+# conflicts during RPM install.  If a directory appears in this list,
+# it means it might be shared by multiple packages.
 set( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
   /usr/lib
   /usr/lib/hse
@@ -448,6 +447,7 @@ set( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
   /lib
   /opt
   /opt/hse
+  /opt/hse/bin
   /opt/hse/config
 )