From f7473da5e575d2c357a3ece435f95097c091f5ed Mon Sep 17 00:00:00 2001
From: egorsh0 <egorsh@inbox.ru>
Date: Tue, 25 Aug 2015 12:14:40 +0300
Subject: [PATCH] Added to fix for create debuginfo package

---
 Modules/CPackRPM.cmake               | 15 ++++++++++++
 Source/CPack/cmCPackRPMGenerator.cxx | 44 ++++++++++++++++++++++++++++++++++++
 Source/CPack/cmCPackRPMGenerator.h   |  3 +++
 3 files changed, 62 insertions(+)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index cb77fb8..cf20237 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1,3 +1,4 @@
+ 
 #.rst:
 # CPackRPM
 # --------
@@ -80,6 +81,13 @@
 #  * Mandatory : YES
 #  * Default   : "unknown"
 #
+# .. variable:: CPACK_RPM_PACKAGE_DEBUGINFO
+#
+#  Create debuginfo package.
+#  
+#  * Mandatory : -
+#  * Default   : NO
+#
 # .. variable:: CPACK_RPM_PACKAGE_GROUP
 #
 #  The RPM package group.
@@ -1564,6 +1572,11 @@ function(cpack_rpm_generate_package)
     set(CPACK_RPM_USER_BINARY_SPECFILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_BINARY_SPECFILE})
   endif()
 
+  # This is a generated debuginfo package
+  if(CPACK_DEBUGINFO)
+    set(TMP_RPM_DEBUGINFO "%debug_package")
+  endif()
+  
   # We should generate a USER spec file template:
   #  - either because the user asked for it : CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
   #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
@@ -1604,6 +1617,8 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
 %description
 \@CPACK_RPM_PACKAGE_DESCRIPTION\@
 
+\@TMP_RPM_DEBUGINFO\@
+
 # This is a shortcutted spec file generated by CMake RPM generator
 # we skip _install step because CPack does that for us.
 # We do only save CPack installed tree in _prepr
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 71ab3a0..da74fc1 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -131,6 +131,7 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup)
         retval &= PackageOnePack(initialTopLevel,compIt->first);
         }
       }
+    retval &= PackageComponentDebuginfo();
     }
   // CPACK_COMPONENTS_IGNORE_GROUPS is set
   // We build 1 package per component
@@ -147,6 +148,48 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup)
 }
 
 //----------------------------------------------------------------------
+ int cmCPackRPMGenerator::PackageComponentDebuginfo()
+{
+	int retval = 1;
+	if(IsOn("CPACK_RPM_PACKAGE_DEBUGINFO"))
+	{
+		cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Create Debuginfo package" << std::endl);
+		this->SetOption("CPACK_DEBUGINFO", "I_ON");
+		const std::string packageName = "debuginfo";
+
+		std::string packageFileName(
+				cmSystemTools::GetParentDirectory(toplevel)
+		);
+
+		std::string outputFileName(
+				GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"),
+						packageName,
+						true)
+						+ this->GetOutputExtension()
+		);
+
+		packageFileName += "/"+ outputFileName;
+
+		/* replace proposed CPACK_OUTPUT_FILE_NAME */
+		this->SetOption("CPACK_OUTPUT_FILE_NAME",outputFileName.c_str());
+
+		this->SetOption("CPACK_RPM_COMPONENT_INSTALL", "I_ON");
+
+		this->SetOption("CPACK_RPM_PACKAGE_COMPONENT",packageName.c_str());
+
+		if (!this->ReadListFile("CPackRPM.cmake"))
+		{
+			cmCPackLogger(cmCPackLog::LOG_ERROR,
+					"Error while execution CPackRPM.cmake" << std::endl);
+			retval = 0;
+		}
+
+		// add the generated package to package file names list
+		packageFileNames.push_back(packageFileName);
+	}
+	return retval;
+}
+//----------------------------------------------------------------------
 int cmCPackRPMGenerator::PackageComponentsAllInOne()
 {
   int retval = 1;
@@ -236,6 +279,7 @@ int cmCPackRPMGenerator::PackageFiles()
                     "Error while execution CPackRPM.cmake" << std::endl);
       retval = 0;
       }
+    retval &= PackageComponentDebuginfo();
     }
 
   if (!this->IsSet("RPMBUILD_EXECUTABLE"))
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index a7722bc..8fb0c61 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -67,6 +67,9 @@ protected:
    * components will be put in a single installer.
    */
   int PackageComponentsAllInOne();
+
+  int PackageComponentDebuginfo();
+
   virtual const char* GetOutputExtension() { return ".rpm"; }
   virtual bool SupportsComponentInstallation() const;
   virtual std::string GetComponentInstallDirNameSuffix(
-- 
1.8.3.1