diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/apache/bcfg2.conf | 2 | ||||
| -rw-r--r-- | misc/bcfg2-selinux.spec | 16 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 23 |
3 files changed, 27 insertions, 14 deletions
diff --git a/misc/apache/bcfg2.conf b/misc/apache/bcfg2.conf index 6cd5addf5..b8409a513 100644 --- a/misc/apache/bcfg2.conf +++ b/misc/apache/bcfg2.conf @@ -4,7 +4,7 @@ # WSGIScriptAlias /bcfg2 "/usr/share/bcfg2/reports.wsgi" - WSGISocketPrefix /var/run/httpd/wsgi + WSGISocketPrefix /var/run/apache2/wsgi WSGIDaemonProcess Bcfg2.Server.Reports processes=1 threads=10 WSGIProcessGroup Bcfg2.Server.Reports diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index e5a0eed16..4c05f4959 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -8,8 +8,8 @@ %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types}) Name: bcfg2-selinux -Version: 1.3.0 -Release: 0.0rc2 +Version: 1.3.1 +Release: 1 Summary: Bcfg2 Client and Server SELinux policy %if 0%{?suse_version} @@ -24,8 +24,8 @@ Conflicts: selinux-policy = 3.11.1 License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc2.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}rc2-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: checkpolicy, selinux-policy-devel, hardlink @@ -65,7 +65,7 @@ deployment strategies. This package includes the Bcfg2 server and client SELinux policy. %prep -%setup -q -n %{name}-%{version}rc2 +%setup -q -n %{name}-%{version} %build cd redhat/selinux @@ -120,6 +120,12 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Thu Mar 21 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.1-1 +- New upstream release + +* Fri Mar 15 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0 +- New upstream release + * Tue Jan 29 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc2 - New upstream release diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 4aaf15e1c..13bc6474e 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -5,8 +5,8 @@ %{!?_initrddir: %global _initrddir %{_sysconfdir}/rc.d/init.d} Name: bcfg2 -Version: 1.3.0 -Release: 0.0rc2 +Version: 1.3.1 +Release: 1 Summary: Configuration management system %if 0%{?suse_version} @@ -17,8 +17,8 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc2.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}rc2-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -87,7 +87,7 @@ deployment strategies. This package includes the Bcfg2 client software. %package server -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Server %if 0%{?suse_version} Group: System/Management @@ -140,7 +140,7 @@ deployment strategies. This package includes the Bcfg2 server software. %package server-cherrypy -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Server - CherryPy backend %if 0%{?suse_version} Group: System/Management @@ -220,7 +220,7 @@ deployment strategies. This package includes the Bcfg2 documentation. %package web -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Web Reporting Interface %if 0%{?suse_version} Group: System/Management @@ -267,7 +267,7 @@ deployment strategies. This package includes the Bcfg2 reports web frontend. %prep -%setup -q -n %{name}-%{version}rc2 +%setup -q -n %{name}-%{version} %build %{__python}%{pythonversion} setup.py build @@ -311,6 +311,7 @@ cp -r tools/* %{buildroot}%{_defaultdocdir}/bcfg2-server-%{version} cp -r build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version} %{__install} -d %{buildroot}%{apache_conf}/conf.d +sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf %{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf %{__mkdir_p} %{buildroot}%{_localstatedir}/cache/%{name} @@ -453,6 +454,12 @@ fi %endif %changelog +* Thu Mar 21 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.1-1 +- New upstream release + +* Fri Mar 15 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0 +- New upstream release + * Tue Jan 29 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc2 - New upstream release |