From d1787523fcb43b5382c0ff5f397b54ac49ba7205 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Mon, 14 Nov 2011 15:13:20 -0600
Subject: [PATCH] Binary packaging script tweaks.

- Now requiring CMake 2.8.6
- Make moving of packages into build/ independent of package names.
- Bro-all package renamed to Bro and Bro renamed to Bro-minimal
  which is more similar to source packages now.
---
 pkg/check-cmake       | 2 +-
 pkg/make-deb-packages | 8 ++++----
 pkg/make-mac-packages | 8 ++++----
 pkg/make-rpm-packages | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/check-cmake b/pkg/check-cmake
index 2c3ed765a6..17531af2f7 100755
--- a/pkg/check-cmake
+++ b/pkg/check-cmake
@@ -5,7 +5,7 @@
 # version of CMake is required to obtain consistency, but can be increased
 # as new versions of CMake come out that also produce working packages.
 
-CMAKE_PACK_REQ="cmake version 2.8.4"
+CMAKE_PACK_REQ="cmake version 2.8.6"
 CMAKE_VER=`cmake -version`
 
 if [ "${CMAKE_VER}" != "${CMAKE_PACK_REQ}" ]; then
diff --git a/pkg/make-deb-packages b/pkg/make-deb-packages
index a9de210e52..432de8336a 100755
--- a/pkg/make-deb-packages
+++ b/pkg/make-deb-packages
@@ -27,21 +27,21 @@ cd ..
 
 # Minimum Bro
 ./configure --prefix=${prefix} --disable-broccoli --disable-broctl \
-            --pkg-name-prefix=Bro --binary-package
+            --pkg-name-prefix=Bro-minimal --binary-package
 ( cd build && make package )
 
 # Full Bro package
-./configure --prefix=${prefix} --pkg-name-prefix=Bro-all --binary-package
+./configure --prefix=${prefix} --pkg-name-prefix=Bro --binary-package
 ( cd build && make package )
 
 # Broccoli
 cd aux/broccoli
 ./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv Broccoli*.deb ../../../build/ )
+( cd build && make package && mv *.deb ../../../build/ )
 cd ../..
 
 # Broctl
 cd aux/broctl
 ./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv Broctl*.deb ../../../build/ )
+( cd build && make package && mv *.deb ../../../build/ )
 cd ../..
diff --git a/pkg/make-mac-packages b/pkg/make-mac-packages
index a8f7f965c8..829a64ca25 100755
--- a/pkg/make-mac-packages
+++ b/pkg/make-mac-packages
@@ -35,25 +35,25 @@ cd ..
 
 # Minimum Bro
 CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --disable-broccoli --disable-broctl --pkg-name-prefix=Bro \
+    --disable-broccoli --disable-broctl --pkg-name-prefix=Bro-minimal \
     --binary-package
 ( cd build && make package )
 
 # Full Bro package
 CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --pkg-name-prefix=Bro-all --binary-package
+    --pkg-name-prefix=Bro --binary-package
 ( cd build && make package )
 
 # Broccoli
 cd aux/broccoli
 CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
     --binary-package
-( cd build && make package && mv Broccoli*.dmg ../../../build/ )
+( cd build && make package && mv *.dmg ../../../build/ )
 cd ../..
 
 # Broctl
 cd aux/broctl
 CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
     --binary-package
-( cd build && make package && mv Broctl*.dmg ../../../build/ )
+( cd build && make package && mv *.dmg ../../../build/ )
 cd ../..
diff --git a/pkg/make-rpm-packages b/pkg/make-rpm-packages
index ac8dfa97b4..9560cc80ff 100755
--- a/pkg/make-rpm-packages
+++ b/pkg/make-rpm-packages
@@ -20,21 +20,21 @@ cd ..
 
 # Minimum Bro
 ./configure --prefix=${prefix} --disable-broccoli --disable-broctl \
-            --pkg-name-prefix=Bro --binary-package
+            --pkg-name-prefix=Bro-minimal --binary-package
 ( cd build && make package )
 
 # Full Bro package
-./configure --prefix=${prefix} --pkg-name-prefix=Bro-all --binary-package
+./configure --prefix=${prefix} --pkg-name-prefix=Bro --binary-package
 ( cd build && make package )
 
 # Broccoli
 cd aux/broccoli
 ./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv Broccoli*.rpm ../../../build/ )
+( cd build && make package && mv *.rpm ../../../build/ )
 cd ../..
 
 # Broctl
 cd aux/broctl
 ./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv Broctl*.rpm ../../../build/ )
+( cd build && make package && mv *.rpm ../../../build/ )
 cd ../..