Changeset: e1e9e22bf3d7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e1e9e22bf3d7
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (99 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -914,62 +914,62 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
%cmake3_build
%install
-mkdir -p "%{buildroot}/usr"
-for d in etc var; do mkdir "%{buildroot}/$d"; ln -s ../$d
"%{buildroot}/usr/$d"; done
+mkdir -p "${RPM_BUILD_ROOT}"/usr
+for d in etc var; do mkdir "${RPM_BUILD_ROOT}"/$d; ln -s ../$d
"${RPM_BUILD_ROOT}"/usr/$d; done
%cmake3_install
-rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc"
+rm "${RPM_BUILD_ROOT}"/usr/var "${RPM_BUILD_ROOT}"/usr/etc
# move file to correct location
-mkdir -p %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sysusersdir}
-mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%{buildroot}%{_tmpfilesdir}
-cat > %{buildroot}%{_sysusersdir}/monetdb.conf << EOF
+mkdir -p "${RPM_BUILD_ROOT}"%{_tmpfilesdir} "${RPM_BUILD_ROOT}"%{_sysusersdir}
+mv "${RPM_BUILD_ROOT}"%{_sysconfdir}/tmpfiles.d/monetdbd.conf
"${RPM_BUILD_ROOT}"%{_tmpfilesdir}
+cat > "${RPM_BUILD_ROOT}"%{_sysusersdir}/monetdb.conf << EOF
u monetdb - "MonetDB Server" /var/lib/monetdb
EOF
-rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d
+rmdir "${RPM_BUILD_ROOT}"%{_sysconfdir}/tmpfiles.d
-install -d -m 0750 %{buildroot}%{_localstatedir}/lib/monetdb
-install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm
-install -d -m 0775 %{buildroot}%{_localstatedir}/log/monetdb
-install -d -m 0775 %{buildroot}%{_rundir}/monetdb
+install -d -m 0750 "${RPM_BUILD_ROOT}"%{_localstatedir}/lib/monetdb
+install -d -m 0770 "${RPM_BUILD_ROOT}"%{_localstatedir}/monetdb5/dbfarm
+install -d -m 0775 "${RPM_BUILD_ROOT}"%{_localstatedir}/log/monetdb
+install -d -m 0775 "${RPM_BUILD_ROOT}"%{_rundir}/monetdb
# remove unwanted stuff
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_microbenchmark*.so
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_udf*.so
-rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
-rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
+rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_opt_sql_append.so
+rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_microbenchmark*.so
+rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_udf*.so
+rm -f "${RPM_BUILD_ROOT}"%{_bindir}/monetdb_mtest.sh
+rm -rf "${RPM_BUILD_ROOT}"%{_datadir}/monetdb # /cmake
if [ -x /usr/sbin/hardlink ]; then
- /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+ /usr/sbin/hardlink -cv "${RPM_BUILD_ROOT}"%{_datadir}/selinux
else
# Fedora 31
- /usr/bin/hardlink -cv %{buildroot}%{_datadir}/selinux
+ /usr/bin/hardlink -cv "${RPM_BUILD_ROOT}"%{_datadir}/selinux
fi
# update shebang lines for Python scripts
%if %{?py3_shebang_fix:1}%{!?py3_shebang_fix:0}
# Fedora has py3_shebang_fix macro
- %{py3_shebang_fix} %{buildroot}%{_bindir}/*.py
+ %{py3_shebang_fix} "${RPM_BUILD_ROOT}"%{_bindir}/*.py
%else
# EPEL does not, but we can use the script directly
- /usr/bin/pathfix.py -pni "%{__python3} -s" %{buildroot}%{_bindir}/*.py
+ /usr/bin/pathfix.py -pni "%{__python3} -s"
"${RPM_BUILD_ROOT}"%{_bindir}/*.py
%endif
%if %{with compat}
# delete files that are not going to be installed in compat packages
-rm
%{buildroot}%{_bindir}/{M{convert.py,test.py,z.py},bincopydata,example_proxy,m{alsample.pl,client,ktest.py,onetdb{,d},s{erver5,qldump},urltest},s{ample{0,1,4},hutdowntest,mack0{0,1},ql{logictest.py,sample.p{hp,l}},treamcat},testcondvar}
-rm -r %{buildroot}%{_datadir}/doc/MonetDB*
-rm %{buildroot}%{_datadir}/selinux/*/monetdb.pp
-rm -r %{buildroot}%{_includedir}/monetdb
-rm %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/libmonetdbe.so.*
-rm -r %{buildroot}%{_libdir}/pkgconfig
-rm -r %{buildroot}%{_localstatedir}/lib/monetdb
%{buildroot}%{_localstatedir}/monetdb5
-rm -r %{buildroot}%{_mandir}/man1
-rm -r %{buildroot}%{python3_sitelib}/MonetDBtesting
-rm %{buildroot}%{_sysconfdir}/logrotate.d/monetdbd
-rm %{buildroot}%{_sysusersdir}/monetdb.conf
-rm %{buildroot}%{_tmpfilesdir}/monetdbd.conf
-rm %{buildroot}%{_unitdir}/monetdbd.service
+rm
"${RPM_BUILD_ROOT}"%{_bindir}/{M{convert.py,test.py,z.py},bincopydata,example_proxy,m{alsample.pl,client,ktest.py,onetdb{,d},s{erver5,qldump},urltest},s{ample{0,1,4},hutdowntest,mack0{0,1},ql{logictest.py,sample.p{hp,l}},treamcat},testcondvar}
+rm -r "${RPM_BUILD_ROOT}"%{_datadir}/doc/MonetDB*
+rm "${RPM_BUILD_ROOT}"%{_datadir}/selinux/*/monetdb.pp
+rm -r "${RPM_BUILD_ROOT}"%{_includedir}/monetdb
+rm "${RPM_BUILD_ROOT}"%{_libdir}/*.so
"${RPM_BUILD_ROOT}"%{_libdir}/libmonetdbe.so.*
+rm -r "${RPM_BUILD_ROOT}"%{_libdir}/pkgconfig
+rm -r "${RPM_BUILD_ROOT}"%{_localstatedir}/lib/monetdb
"${RPM_BUILD_ROOT}"%{_localstatedir}/monetdb5
+rm -r "${RPM_BUILD_ROOT}"%{_mandir}/man1
+rm -r "${RPM_BUILD_ROOT}"%{python3_sitelib}/MonetDBtesting
+rm "${RPM_BUILD_ROOT}"%{_sysconfdir}/logrotate.d/monetdbd
+rm "${RPM_BUILD_ROOT}"%{_sysusersdir}/monetdb.conf
+rm "${RPM_BUILD_ROOT}"%{_tmpfilesdir}/monetdbd.conf
+rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetdbd.service
%endif
%changelog
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
