resolved merge conflict
This commit is contained in:
commit
20ec204a9b
|
@ -17,8 +17,8 @@ BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached
|
||||||
BuildRequires: boost-devel >= 1.37.0
|
BuildRequires: boost-devel >= 1.37.0
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
|
||||||
%ifnarch ppc64 sparc64
|
# google perftools available only on these
|
||||||
# no google perftools
|
%ifarch %{ix86} x86_64 ppc
|
||||||
BuildRequires: google-perftools-devel
|
BuildRequires: google-perftools-devel
|
||||||
%endif
|
%endif
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
|
@ -172,6 +172,9 @@ fi
|
||||||
- Adding gearadmin files
|
- Adding gearadmin files
|
||||||
- Converted to Systemd. Resolves BZ#661643
|
- Converted to Systemd. Resolves BZ#661643
|
||||||
|
|
||||||
|
* Tue Mar 22 2011 Dan Horák <dan[at]danny.cz> - 0.14-4
|
||||||
|
- switch to %%ifarch for google-perftools as BR
|
||||||
|
|
||||||
* Thu Feb 17 2011 BJ Dierkes <wdierkes@rackspace.com> - 0.14-3
|
* Thu Feb 17 2011 BJ Dierkes <wdierkes@rackspace.com> - 0.14-3
|
||||||
- Rebuild against latest libevent in rawhide/f15
|
- Rebuild against latest libevent in rawhide/f15
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue