diff --git a/salt.changes b/salt.changes index 5b9f61c..932e7bd 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 20 12:22:26 UTC 2015 - bwiedemann@suse.com + +- only require git-core to not pull in git-web and gitk + ------------------------------------------------------------------- Wed Jul 8 08:47:32 UTC 2015 - aboe76@gmail.com diff --git a/salt.spec b/salt.spec index c473939..c22693f 100644 --- a/salt.spec +++ b/salt.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: salt Version: 2015.5.3 Release: 0 @@ -39,8 +40,8 @@ BuildRequires: python-msgpack-python > 0.3 BuildRequires: python-psutil BuildRequires: python-pycrypto BuildRequires: python-pyzmq >= 2.2.0 -BuildRequires: python-tornado BuildRequires: python-requests >= 1.0.0 +BuildRequires: python-tornado BuildRequires: python-yaml %if 0%{?sles_version} @@ -64,17 +65,17 @@ BuildRequires: python-sphinx Requires: logrotate Requires: python-Jinja2 -Requires: python-M2Crypto +Requires: python-M2Crypto Requires: python-PyYAML Requires: python-apache-libcloud -Requires: python-msgpack-python +Requires: python-msgpack-python Requires: python-psutil +Requires: python-pycrypto +Requires: python-pyzmq Requires: python-tornado Requires: python-xml Requires: python-yaml Requires: python-zypp -Requires: python-pyzmq -Requires: python-pycrypto Requires(pre): %fillup_prereq %if 0%{?suse_version} < 1210 Requires(pre): %insserv_prereq @@ -115,7 +116,7 @@ Summary: The api for Salt a parallel remote execution system Group: System/Monitoring Requires: %{name} = %{version} Requires: %{name}-master = %{version} -Requires: python-CherryPy +Requires: python-CherryPy %description api salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system. @@ -148,7 +149,7 @@ Summary: Management component for salt, a parallel remote execution syste Group: System/Monitoring Requires: %{name} = %{version} %if 0%{?suse_version} == 1315 -Recommends: git +Recommends: git-core Recommends: python-pygit2 %else Requires: git @@ -534,4 +535,4 @@ install -Dpm 0644 pkg/zsh_completion.zsh %{buildroot}/etc/zsh_completion.d/%{nam %endif #with_bashcomp -%changelog \ No newline at end of file +%changelog