Dominique Leuenberger 2015-11-16 17:51:20 +00:00 committed by Git OBS Bridge
parent 072893e82d
commit 7ec90f844f
2 changed files with 18 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 13 09:18:31 UTC 2015 - jimmy@boombatower.com
- Small consistency cleanups.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 02:32:41 UTC 2015 - jimmy@boombatower.com Thu Nov 12 02:32:41 UTC 2015 - jimmy@boombatower.com

View File

@ -144,11 +144,11 @@ autoreconf -fiv
export CXXFLAGS="$CXXFLAGS %{optflags} -fPIC" export CXXFLAGS="$CXXFLAGS %{optflags} -fPIC"
export CFLAGS="$CFLAGS %{optflags} -fPIC" export CFLAGS="$CFLAGS %{optflags} -fPIC"
%configure \ %configure \
--with-cli=yes \ --with-cli=yes \
--with-daemon=yes \ --with-daemon=yes \
--with-gui=qt5 \ --with-gui=qt5 \
--with-miniupnpc \ --with-miniupnpc \
--with-qrencode \ --with-qrencode \
%if %{consensus} == 0 %if %{consensus} == 0
--without-libs \ --without-libs \
%endif %endif
@ -193,8 +193,8 @@ install -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/%{name}d.conf
%if %{consensus} == 1 %if %{consensus} == 1
# do not ship these # do not ship these
rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.a rm -f %{buildroot}%{_libdir}/lib%{name}consensus.a
rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.la rm -f %{buildroot}%{_libdir}/lib%{name}consensus.la
%endif %endif
%post qt5 %post qt5
@ -203,6 +203,12 @@ rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.la
%postun qt5 %postun qt5
%desktop_database_postun %desktop_database_postun
%if %{consensus} == 1
%post -n lib%{name}consensus0 -p /sbin/ldconfig
%postun -n lib%{name}consensus0 -p /sbin/ldconfig
%endif
%pre -n %{name}d %pre -n %{name}d
getent group %{name} >/dev/null || groupadd -r %{name} getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "%{name_pretty} daemon" %{name} getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "%{name_pretty} daemon" %{name}
@ -222,12 +228,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || :
%postun -n %{name}d %postun -n %{name}d
%service_del_postun %{name}d.service %service_del_postun %{name}d.service
%if %{consensus} == 1
%post -n lib%{name}consensus0 -p /sbin/ldconfig
%postun -n lib%{name}consensus0 -p /sbin/ldconfig
%endif
%files qt5 %files qt5
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING README.md %doc COPYING README.md