Skip to content

Commit

Permalink
Merge pull request saltstack#14884 from terminalmage/update-spec
Browse files Browse the repository at this point in the history
Fix incorrect conditional in spec
  • Loading branch information
techhat committed Aug 10, 2014
2 parents 1e86093 + 1704962 commit 8eb3439
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions pkg/rpm/salt.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

Name: salt
Version: 2014.1.10
Release: 2%{?dist}
Release: 4%{?dist}
Summary: A parallel remote execution system

Group: System Environment/Daemons
Expand Down Expand Up @@ -125,7 +125,7 @@ servers, handle them quickly and through a simple and manageable interface.
Summary: Management component for salt, a parallel remote execution system
Group: System Environment/Daemons
Requires: salt = %{version}-%{release}
%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
%if (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
Requires: systemd-python
%endif

Expand Down Expand Up @@ -332,10 +332,13 @@ rm -rf %{buildroot}
%endif

%changelog
* Tue Aug 5 2014 Erik Johnson <[email protected]> - 2014.1.10-2
* Sun Aug 10 2014 Erik Johnson <[email protected]> - 2014.1.10-4
- Fix incorrect conditional

* Tue Aug 5 2014 Erik Johnson <[email protected]> - 2014.1.10-2
- Deploy cachedir with package

* Mon Aug 4 2014 Erik Johnson <[email protected]> - 2014.1.10-1
* Mon Aug 4 2014 Erik Johnson <[email protected]> - 2014.1.10-1
- Update to bugfix release 2014.1.10

* Thu Jul 10 2014 Erik Johnson <[email protected]> - 2014.1.7-3
Expand All @@ -350,7 +353,7 @@ rm -rf %{buildroot}
* Sun Jun 08 2014 Fedora Release Engineering <[email protected]> - 2014.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

* Tue May 6 2014 Erik Johnson <[email protected]> - 2014.1.4-1
* Tue May 6 2014 Erik Johnson <[email protected]> - 2014.1.4-1
- Update to bugfix release 2014.1.4

* Fri Apr 18 2014 Erik Johnson <[email protected]> - 2014.1.3-1
Expand Down

0 comments on commit 8eb3439

Please sign in to comment.