Fixed packaging scripts

bbc · Oct 1, 2023 · 97c7e5c · 97c7e5c
1 parent 47a5920
commit 97c7e5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/rpm/Dockerfile-centos7 b/rpm/Dockerfile-centos7
@@ -29,7 +29,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
+    cmake3 -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack3 -G RPM
 

diff --git a/ubuntu/package.sh b/ubuntu/package.sh
@@ -37,9 +37,11 @@ cleanup() {
     rm -rf ${SOURCE_DIR}/.git
     rm -rf ${SOURCE_DIR}/.github
     rm -rf ${SOURCE_DIR}/.gitignore
-    rm -rf ${SOURCE_DIR}/test
+    rm -rf ${SOURCE_DIR}/doc/example.png
+    rm -rf ${SOURCE_DIR}/doc/DataFormat.md
     rm -rf ${SOURCE_DIR}/Doxyfile
     rm -rf ${SOURCE_DIR}/rpm
+    rm -rf ${SOURCE_DIR}/test
     rm -rf ${SOURCE_DIR}/ubuntu
 }
 
@@ -54,6 +56,8 @@ sourcepackage() {
         --exclude=.gitignore \
         --exclude=.github \
         --exclude=debian \
+        --exclude=doc/example.png \
+        --exclude=doc/DataFormat.md \
         --exclude=Doxyfile \
         --exclude=rpm \
         --exclude=test \
@@ -118,14 +122,14 @@ case "$1" in
         cleanup
         ;;
 
-    debs)
-        debs
-        ;;
-
     sourcepackage)
         sourcepackage
         ;;
 
+    debs)
+        debs
+        ;;
+
     deb)
         deb
         ;;