diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
| commit | e30c785c94c5aa399c44fff386fa2279f64f1acc (patch) | |
| tree | e72c636dcae00a6ea0c668cfbee7d3e6b4e6a3fe /misc | |
| parent | 7aa15c4c5507e311ff66264bc31e6758a80eb337 (diff) | |
| parent | 103b1b5198828876fa0684296900769018075f1b (diff) | |
| download | bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.gz bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.bz2 bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Compare.py
src/lib/Bcfg2/Server/Admin/Snapshots.py
src/lib/Bcfg2/Server/MultiprocessingCore.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/sbin/bcfg2-crypt
src/sbin/bcfg2-reports
tools/upgrade/1.3/migrate_configs.py
tools/upgrade/1.3/migrate_perms_to_mode.py
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2-selinux.spec | 17 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 7 |
2 files changed, 19 insertions, 5 deletions
diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index fa70d2c42..d694783b5 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -7,9 +7,17 @@ %global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null) %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types}) +# For -pre or -rc releases, remove the initial <hash><percent> +# characters from the appropriate line below. +# +# Don't forget to change the Release: tag below to something like 0.1 +#%%global _rc 1 +#%%global _pre 2 +%global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} + Name: bcfg2-selinux -Version: 1.3.2 -Release: 1 +Version: 1.3.3 +Release: 1%{?_pre_rc}%{?dist} Summary: Bcfg2 Client and Server SELinux policy %if 0%{?suse_version} @@ -65,7 +73,7 @@ deployment strategies. This package includes the Bcfg2 server and client SELinux policy. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?_pre_rc} %build cd redhat/selinux @@ -120,6 +128,9 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Thu Nov 07 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.3-1 +- New upstream release + * Mon Jul 01 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.2-1 - New upstream release diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 788ec1cf3..0399e9356 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -23,8 +23,8 @@ %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} Name: bcfg2 -Version: 1.3.2 -Release: 2%{?_pre_rc}%{?dist} +Version: 1.3.3 +Release: 1%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} @@ -753,6 +753,9 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Thu Nov 07 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.3-1 +- New upstream release + * Sun Aug 04 2013 John Morris <john@zultron.com> - 1.3.2-2 - Reconcile divergences with Fedora specfile, as requested by upstream (equally large changes made in Fedora version to reconcile with |