File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- 9
1+ 13
Original file line number Diff line number Diff line change @@ -20,10 +20,9 @@ include /usr/share/dpkg/default.mk
2020
2121gpinstall :
2222 make install DESTDIR=${DEBIAN_DESTINATION} prefix=
23- # Copy Apache compliance files
24- mkdir -p ${DEBIAN_DESTINATION}${CBDB_BIN_PATH}
25- cp -a LICENSE NOTICE DISCLAIMER ${DEBIAN_DESTINATION}${CBDB_BIN_PATH} /
26- cp -a licenses ${DEBIAN_DESTINATION}${CBDB_BIN_PATH} /
23+ # Copy Apache compliance files into the build staging directory
24+ cp -a LICENSE NOTICE DISCLAIMER ${DEBIAN_DESTINATION} /
25+ cp -a licenses ${DEBIAN_DESTINATION} /
2726 # Create debian/copyright for Debian policy compliance
2827 mkdir -p $(shell pwd) /debian
2928 cat LICENSE NOTICE > $(shell pwd) /debian/copyright
Original file line number Diff line number Diff line change @@ -165,11 +165,6 @@ ln -sfn %{cloudberry_install_dir}-%{version} %{buildroot}%{cloudberry_install_di
165165%{prefix }-%{version }
166166%{prefix }
167167
168- %license %{cloudberry_install_dir }-%{version }/LICENSE
169- %doc %{cloudberry_install_dir }-%{version }/NOTICE
170- %doc %{cloudberry_install_dir }-%{version }/DISC LAIMER
171- %{cloudberry_install_dir }-%{version }/licenses/
172-
173168%debug_package
174169
175170%post
Original file line number Diff line number Diff line change @@ -128,6 +128,9 @@ mkdir -p ~/rpmbuild/SOURCES
128128# Find project root (assumed to be four levels up from scripts directory: devops/build/packaging/rpm/)
129129PROJECT_ROOT=" $( cd " $( dirname " $0 " ) /../../../../" && pwd) "
130130
131+ # Define the target spec file path
132+ SPEC_FILE=~ /rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
133+
131134# Copy the spec file to rpmbuild/SPECS if the source exists and is different
132135if [ -f " $SOURCE_SPEC_FILE " ]; then
133136 # Avoid copying if SPEC_FILE is already a symlink/file pointing to SOURCE_SPEC_FILE (common in CI)
154157 echo " Warning: licenses directory not found in $PROJECT_ROOT "
155158fi
156159
157- # Define the target spec file path
158- SPEC_FILE=~ /rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
159-
160160# Check if the spec file exists at the target location before proceeding
161161if [ ! -f " $SPEC_FILE " ]; then
162162 echo " Error: Spec file not found at $SPEC_FILE ."
You can’t perform that action at this time.
0 commit comments