diff --git a/bitcoin.changes b/bitcoin.changes index a46a213..838886a 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -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 diff --git a/bitcoin.spec b/bitcoin.spec index 2e5dec5..67a9beb 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -144,11 +144,11 @@ autoreconf -fiv export CXXFLAGS="$CXXFLAGS %{optflags} -fPIC" export CFLAGS="$CFLAGS %{optflags} -fPIC" %configure \ - --with-cli=yes \ - --with-daemon=yes \ - --with-gui=qt5 \ - --with-miniupnpc \ - --with-qrencode \ + --with-cli=yes \ + --with-daemon=yes \ + --with-gui=qt5 \ + --with-miniupnpc \ + --with-qrencode \ %if %{consensus} == 0 --without-libs \ %endif @@ -193,8 +193,8 @@ install -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/%{name}d.conf %if %{consensus} == 1 # do not ship these -rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.a -rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.la +rm -f %{buildroot}%{_libdir}/lib%{name}consensus.a +rm -f %{buildroot}%{_libdir}/lib%{name}consensus.la %endif %post qt5 @@ -203,6 +203,12 @@ rm -rf %{buildroot}%{_libdir}/lib%{name}consensus.la %postun qt5 %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 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} @@ -222,12 +228,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || : %postun -n %{name}d %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 %defattr(-,root,root) %doc COPYING README.md