Changeset: af649b436189 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af649b436189
Modified Files:
MonetDB.spec
debian/rules
Branch: Oct2020
Log Message:
Properly specify the location of the /run directory.
Otherwise we get /var/run which various systems complain about.
diffs (38 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -808,6 +808,7 @@ fi
%build
%cmake3 \
+ -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
@@ -881,15 +882,6 @@ else
fi
%endif
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-# fix up some paths (/var/run -> /run)
-# needed because CMAKE_INSTALL_RUNSTATEDIR refers to /var/run
-sed -i 's|/var/run|/run|' \
- %{buildroot}%{_tmpfilesdir}/monetdbd.conf \
- %{buildroot}%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties \
- %{buildroot}%{_unitdir}/monetdbd.service
-%endif
-
%changelog
* Wed Nov 18 2020 Sjoerd Mullender <[email protected]> - 11.39.7-20201118
- Rebuilt.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
+ -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=ON \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
