another CPack commit

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index 2c67b1663eed1a6e7326a7c74baecee3a120e6cb..46ce4519327293048c50b953f6d0f41aeaf8e67e 100644 (file)
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -3,7 +3,7 @@
 
 ##  FOO FOR BUILDING ARCHIVE PACKAGES!!
 
-set (CPACK_GENERATOR TGZ ZIP TGZ TZ STGZ)
+set (CPACK_GENERATOR TGZ)
 set (CPACK_PACKAGE_NAME "snort")
 set (CPACK_PACKAGE_VENDOR "Cisco")
 set (CPACK_PACKAGE_VERSION_MAJOR "${SNORT_VERSION_MAJOR}")
@@ -13,7 +13,7 @@ set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/doc/images/snort.png")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/doc/start.txt")
-set (CPACK_SOURCE_IGNORE_FILES "/tools/snort2lua/tests/")
+set (CPACK_SOURCE_IGNORE_FILES "tools/snort2lua/tests*")
 
 
 #CPACK_SOURCE_PACKAGE_FILE_NAME
@@ -23,25 +23,5 @@ set (CPACK_SOURCE_IGNORE_FILES "/tools/snort2lua/tests/")
 #CPACK_RESOURCE_FILE_WELCOME
 
 
-# This will always be false unless manually set
-if (BUILD_DEBIAN_ARCHIVE)
-    list(APPEND CPACK_GENERATOR DEB)
-endif()
-
-
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "SNORT-TEAM") #required
-
-# RPM foo
-set( CPACK_RPM_PACKAGE_SUMMARY   "The snort RPM package summary")
-set( CPACK_RPM_PACKAGE_NAME      "snort-rpm")
-set( CPACK_RPM_PACKAGE_VERSION   "${SNORT_VERSION_MAJOR}.${SNORT_VERSION_MINOR}.${SNORT_VERSION_BUILD}")
-set( CPACK_RPM_PACKAGE_ARCHITECTURE      "noarch")
-set (CPACK_RPM_PACKAGE_RELEASE   1)
-set( CPACK_RPM_PACKAGE_LICENSE   "unknown")
-#set( CPACK_RPM_PACKAGE_GROUP   "unknown")
-set( CPACK_RPM_PACKAGE_VENDOR   "Cisco")
-set( CPACK_RPM_PACKAGE_DESCRIPTION "Snort RPM")
-
-
 include(CPack)