Quellcode durchsuchen

CPackRPM: do not forget to include installed symlinks (bug 9927)

Eric
Eric Noulard vor 16 Jahren
Ursprung
Commit
03a8e912cb
1 geänderte Dateien mit 5 neuen und 1 gelöschten Zeilen
  1. 5 1
      Modules/CPackRPM.cmake

+ 5 - 1
Modules/CPackRPM.cmake

@@ -363,7 +363,9 @@ SET(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
 SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
 
 # Use files tree to construct files command (spec file)
-EXECUTE_PROCESS(COMMAND find -type f
+# We should not forget to include symlinks (thus -o -type l)
+# We must remove the './' due to the local search (thus the sed)
+EXECUTE_PROCESS(COMMAND find -type f -o -type l
                COMMAND sed {s/\\.//}
                WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
                OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
@@ -446,6 +448,8 @@ mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
 ${CPACK_RPM_INSTALL_FILES}
 
 %changelog
+* Sun Nov 22 2009 Erk <[email protected]>
+  Include symlinks in the file list.
 * Sat Nov 14 2009 Erk <[email protected]>
   Replace prep and build step with backup and restore
   of the previously CPack installed tree. This should