Changeset: 97d130d64074 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97d130d64074 Modified Files: MonetDB.spec Branch: Feb2013 Log Message:
Merge with Oct2012 branch. diffs (39 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -478,8 +478,10 @@ fi Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires: MonetDB5-server = %{version}-%{release} +%if %{?rhel:0}%{!?rhel:1} # for systemd-tmpfiles Requires: systemd-units +%endif Obsoletes: MonetDB-SQL-devel Obsoletes: %{name}-SQL @@ -492,16 +494,24 @@ accelerators. It also has an SQL fronte This package contains the SQL frontend for MonetDB5. If you want to use SQL with MonetDB, you will need to install this package. +%if %{?rhel:0}%{!?rhel:1} %post SQL-server5 systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf +%endif %files SQL-server5 %defattr(-,root,root) %{_bindir}/monetdb %{_bindir}/monetdbd %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb +%if %{?rhel:0}%{!?rhel:1} # Fedora 15 and newer %{_sysconfdir}/tmpfiles.d/monetdbd.conf +%else +# RedHat Enterprise Linux +%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb +%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf +%endif %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties %{_libdir}/monetdb5/autoload/*_sql.mal %{_libdir}/monetdb5/lib_sql.so _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list