Changeset: 9000b1ffebe8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9000b1ffebe8
Modified Files:
MonetDB.spec
Branch: Sep2022
Log Message:
Fixed issues reported by rpmlint.
diffs (118 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -82,7 +82,7 @@
Name: %{name}
Version: %{version}
Release: %{release}
-Summary: MonetDB - Monet Database Management System
+Summary: Monet Database Management System
Vendor: MonetDB BV <[email protected]>
Group: Applications/Databases
@@ -144,12 +144,12 @@ BuildRequires: texlive-obsolete
%endif
%endif
# optional packages:
-# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
-# BuildRequires: pkgconfig(gdal) # -DSHP=ON
-# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON
-# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON
-# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON
-# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON
+# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
+# BuildRequires: pkgconfig(gdal) # -DSHP=ON
+# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON
+# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON
+# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON
+# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
@@ -505,17 +505,17 @@ getent group monetdb >/dev/null || group
if getent passwd monetdb >/dev/null; then
case $(getent passwd monetdb | cut -d: -f6) in
%{_localstatedir}/MonetDB) # old value
- # change home directory, but not using usermod
- # usermod requires there to not be any running processes owned by the
user
- EDITOR='sed -i
"/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"'
- unset VISUAL
- export EDITOR
- /sbin/vipw > /dev/null
- ;;
+ # change home directory, but not using usermod
+ # usermod requires there to not be any running processes owned by the
user
+ EDITOR='sed -i
"/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"'
+ unset VISUAL
+ export EDITOR
+ /sbin/vipw > /dev/null
+ ;;
esac
else
useradd --system --gid monetdb --home-dir %{_localstatedir}/lib/monetdb \
- --shell /sbin/nologin --comment "MonetDB Server" monetdb
+ --shell /sbin/nologin --comment "MonetDB Server" monetdb
fi
exit 0
@@ -782,33 +782,33 @@ fi
%build
%cmake3 \
- -DCMAKE_INSTALL_RUNSTATEDIR=/run \
- -DRELEASE_VERSION=ON \
- -DASSERT=OFF \
- -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
- -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
- -DGEOM=%{?with_geos:ON}%{!?with_geos:OFF} \
- -DINT128=%{?with_hugeint:ON}%{!?with_hugeint:OFF} \
- -DNETCDF=OFF \
- -DODBC=ON \
- -DPY3INTEGRATION=%{?with_py3integration:ON}%{!?with_py3integration:OFF}
\
- -DRINTEGRATION=%{?with_rintegration:ON}%{!?with_rintegration:OFF} \
- -DSANITIZER=OFF \
- -DSHP=OFF \
- -DSTRICT=OFF \
- -DTESTING=ON \
- -DWITH_BZ2=ON \
- -DWITH_CMOCKA=OFF \
- -DWITH_CURL=ON \
- -DWITH_LZ4=ON \
- -DWITH_LZMA=ON \
- -DWITH_PCRE=ON \
- -DWITH_PROJ=OFF \
- -DWITH_READLINE=ON \
- -DWITH_SNAPPY=OFF \
- -DWITH_VALGRIND=OFF \
- -DWITH_XML2=ON \
- -DWITH_ZLIB=ON
+ -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+ -DRELEASE_VERSION=ON \
+ -DASSERT=OFF \
+ -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
+ -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
+ -DGEOM=%{?with_geos:ON}%{!?with_geos:OFF} \
+ -DINT128=%{?with_hugeint:ON}%{!?with_hugeint:OFF} \
+ -DNETCDF=OFF \
+ -DODBC=ON \
+
-DPY3INTEGRATION=%{?with_py3integration:ON}%{!?with_py3integration:OFF} \
+ -DRINTEGRATION=%{?with_rintegration:ON}%{!?with_rintegration:OFF} \
+ -DSANITIZER=OFF \
+ -DSHP=OFF \
+ -DSTRICT=OFF \
+ -DTESTING=ON \
+ -DWITH_BZ2=ON \
+ -DWITH_CMOCKA=OFF \
+ -DWITH_CURL=ON \
+ -DWITH_LZ4=ON \
+ -DWITH_LZMA=ON \
+ -DWITH_PCRE=ON \
+ -DWITH_PROJ=OFF \
+ -DWITH_READLINE=ON \
+ -DWITH_SNAPPY=OFF \
+ -DWITH_VALGRIND=OFF \
+ -DWITH_XML2=ON \
+ -DWITH_ZLIB=ON
%cmake3_build
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
