rpms/gearmand
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
BJ Dierkes 2011-06-03 12:52:20 -05:00
commit 20ec204a9b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gearmand.spec
View File

@ -17,8 +17,8 @@ BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached
BuildRequires: boost-devel >= 1.37.0
BuildRequires: systemd-units
%ifnarch ppc64 sparc64
# no google perftools
# google perftools available only on these
%ifarch %{ix86} x86_64 ppc
BuildRequires: google-perftools-devel
%endif
Requires(pre): shadow-utils
@ -172,6 +172,9 @@ fi
- Adding gearadmin files
- 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
- Rebuild against latest libevent in rawhide/f15