[bcfg2/el6: 16/16] Merge branch 'master' into el6
Fabian Affolter
fab at fedoraproject.org
Sat Jul 7 16:44:56 UTC 2012
commit 05ec3d049ea4790134afd45e9a0b9898a9cbfa13
Merge: 8aebfef b6ec5d6
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date: Sat Jul 7 18:44:45 2012 +0200
Merge branch 'master' into el6
Conflicts:
.gitignore
bcfg2.spec
sources
.gitignore | 27 ++++++
bcfg2.spec | 262 ++++++++++++++++++++++++++++++++++++++++++++++++------------
sources | 5 +
3 files changed, 243 insertions(+), 51 deletions(-)
---
diff --cc .gitignore
index 47a2e7e,cc14dea..9983ae0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,24 +1,37 @@@
++<<<<<<< HEAD
+/bcfg2-1.1.2.tar.gz
+/bcfg2-1.1.2.tar.gz.gpg
+/bcfg2-1.1.2-unescaped-shell-command-fixes.patch
+
+/bcfg2-1.1.3.tar.gz
+/bcfg2-1.1.3.tar.gz.gpg
+/bcfg2-1.2.0.tar.gz
+/bcfg2-1.2.0.tar.gz.gpg
+/bcfg2-1.2.1.tar.gz
+/bcfg2-1.2.1.tar.gz.gpg
++=======
+ /bcfg2-1.1.0rc4.tar.gz
+ /bcfg2-1.1.0rc4.tar.gz.gpg
+ /tgenshi-indent.patch
+ /YUMng.py
+ /bcfg2-1.1.0rc5.tar.gz
+ /bcfg2-1.1.0rc5.tar.gz.gpg
+ /bcfg2-1.1.0.tar.gz
+ /bcfg2-1.1.0.tar.gz.gpg
+ /bcfg2-1.1.1.tar.gz
+ /bcfg2-1.1.1.tar.gz.gpg
+ /bcfg2-1.2.0pre1.tar.gz
+ /bcfg2-1.2.0pre1.tar.gz.gpg
+ /bcfg2-1.2.0pre2.tar.gz
+ /bcfg2-1.2.0pre2.tar.gz.gpg
+ /bcfg2-1.2.0pre3.tar.gz
+ /bcfg2-1.2.0pre3.tar.gz.gpg
+ /bcfg2-1.2.0rc1.tar.gz
+ /bcfg2-1.2.0rc1.tar.gz.gpg
+ /bcfg2-1.2.1.tar.gz.gpg
+ /bcfg2-1.2.1.tar.gz
+ /bcfg2-1.2.2.tar.gz
+ /bcfg2-1.2.2.tar.gz.gpg
+ /bcfg2-1.2.3.tar.gz
+ /bcfg2-1.2.3.tar.gz.gpg
++>>>>>>> master
diff --cc bcfg2.spec
index 65de74a,b8e62d7..6af6508
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@@ -1,10 -1,16 +1,13 @@@
- %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
- %endif
-%if (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
+ %{!?py_ver: %define py_ver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+ %global pythonversion %{py_ver}
+ #%global _rc 1
+ #%global _pre 3
Name: bcfg2
- Version: 1.2.1
+ Version: 1.2.3
Release: 1%{?dist}
+ #Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
+ #Release: 0.1%{?_pre:.pre%{_pre}}%{?dist}
Summary: A configuration management system
Group: Applications/System
@@@ -68,26 -88,26 +87,44 @@@ Requires: python-ss
%endif
%description server
-Configuration management server
+A configuration management server
+
+%package web
+Summary: Bcfg2 Web Reporting Interface
+Group: System
+
+Requires: bcfg2-server
+Requires: httpd
+Requires: Django
+%if "%{_vendor}" == "redhat"
+Requires: mod_wsgi
+%define apache_conf %{_sysconfdir}/httpd
+%else
+Requires: apache2-mod_wsgi
+%define apache_conf %{_sysconfdir}/apache2
+%endif
+
+%description web
+The Bcfg2 Web Reporting Interface.
+ %package web
+ Summary: Bcfg2 Web Reporting Interface
+ Group: System
+
+ Requires: bcfg2-server
+ Requires: httpd
+ Requires: Django
+ %if "%{_vendor}" == "redhat"
+ Requires: mod_wsgi
+ %define apache_conf %{_sysconfdir}/httpd
+ %else
+ Requires: apache2-mod_wsgi
+ %define apache_conf %{_sysconfdir}/apache2
+ %endif
+
+ %description web
+ The Bcfg2 Web Reporting Interface.
+
%package doc
Summary: Documentation for Bcfg2
Group: System
@@@ -98,10 -118,19 +135,20 @@@ BuildRequires: python-docutil
%description doc
Documentation for Bcfg2.
+ %package examples
+ Summary: Examples for Bcfg2
+ Group: System
+
+ %description examples
+ Examples files for Bcfg2.
+
%prep
+%setup0 -q -n %{name}-%{version}
+ %setup -q
+ #%setup -q -n %{name}-%{version}%{?_rc:rc%{_rc}}
+ #%setup -q -n %{name}-%{version}%{?_pre:pre%{_pre}}
- # fixup some paths
+ # Fixup some paths
%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/bcfg2.init
%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/bcfg2-server.init
%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' tools/bcfg2-cron
@@@ -113,16 -142,20 +160,22 @@@
%{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/bcfg2.init
%{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/bcfg2-server.init
- # get rid of extraneous shebangs
+ # Get rid of extraneous shebangs
for f in `find src/lib -name \*.py`
do
- %{__sed} -i -e '/^#!/,1d' $f
+ %{__sed} -i -e '/^#!/,1d' $f
done
+
%build
+%{__python} -c 'import setuptools; execfile("setup.py")' build
+%{__python} -c 'import setuptools; execfile("setup.py")' build_sphinx
+ %{__python} setup.py build
+ #%{__python} setup.py build_dtddoc
+ %{__python} setup.py build_sphinx
-
+ #%{?pythonpath: export PYTHONPATH="%{pythonpath}"}
+ #%{__python}%{pythonversion} setup.py build_dtddoc
+ #%{__python}%{pythonversion} setup.py build_sphinx
%install
rm -rf %{buildroot}
@@@ -187,17 -266,40 +287,40 @@@ if [ $1 -ge 1 ] ; the
fi
%postun server
- if [ "$1" -ge "1" ]; then
- /sbin/service bcfg2-server condrestart >/dev/null 2>&1 || :
+ %if 0%{?fedora} >= 16
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ %endif
+ if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ %if 0%{?fedora} >= 16
+ /bin/systemctl try-restart bcfg2-server.service >/dev/null 2>&1 || :
+ %else
+ /sbin/service bcfg2-server condrestart &>/dev/null || :
+ %endif
fi
+ %triggerun -- bcfg2 < 1.2.1-1
+ /usr/bin/systemd-sysv-convert --save bcfg2 >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload enable bcfg2.service >/dev/null 2>&1 || :
+ /sbin/chkconfig --del bcfg2 >/dev/null 2>&1 || :
+ /bin/systemctl try-restart bcfg2.service >/dev/null 2>&1 || :
+
+ %triggerun server -- bcfg2-server < 1.2.1-1
+ /usr/bin/systemd-sysv-convert --save bcfg2-server >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload enable bcfg2-server.service >/dev/null 2>&1 || :
+ /sbin/chkconfig --del bcfg2-server >/dev/null 2>&1 || :
+ /bin/systemctl try-restart bcfg2-server.service >/dev/null 2>&1 || :
+
%files
%defattr(-,root,root,-)
- %doc AUTHORS examples COPYRIGHT README
+ %doc AUTHORS COPYRIGHT README
%{_mandir}/man1/bcfg2.1*
-%{_mandir}/man5/bcfg2*.5*
+%{_mandir}/man5/bcfg2.conf.5*
%ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.cert
%ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.conf
+ %if 0%{?fedora} >= 16
+ %config(noreplace) %{_unitdir}/%{name}.service
+ %endif
%config(noreplace) %{_sysconfdir}/sysconfig/bcfg2
%{_sysconfdir}/cron.daily/bcfg2
%{_sysconfdir}/cron.hourly/bcfg2
@@@ -219,49 -321,78 +342,86 @@@
%files server
%defattr(-,root,root,-)
-%{_mandir}/man8/bcfg2*.8*
+%{_mandir}/man8/%{name}*.8*
+%{_mandir}/man5/%{name}*.5*
%ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.key
+ %if 0%{?fedora} >= 16
+ %config(noreplace) %{_unitdir}/%{name}-server.service
+ %endif
%config(noreplace) %{_sysconfdir}/sysconfig/bcfg2-server
%{_initrddir}/bcfg2-server
+%{python_sitelib}/Bcfg2/Server
%{_datadir}/bcfg2
%{_sbindir}/bcfg2-*
%dir %{_var}/lib/bcfg2
-%{python_sitelib}/Bcfg2/Server
+
+%files web
+%defattr(-,root,root,-)
+%{_datadir}/bcfg2/reports.wsgi
+%{_datadir}/bcfg2/site_media
+%config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf
+ %files web
+ %defattr(-,root,root,-)
+ %{_datadir}/bcfg2/reports.wsgi
+ %{_datadir}/bcfg2/site_media
+ %config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf
+
%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/bcfg2-doc-%{version}
#%doc %{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre:pre%{_pre}}
+ #%doc %{_defaultdocdir}/bcfg2-doc-%{version}%{?_rc:rc%{_rc}}
+
+ %files examples
+ %defattr(-,root,root,-)
+ %doc %{_defaultdocdir}/bcfg2-examples-%{version}
+ #%doc %{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre:pre%{_pre}}
+ #%doc %{_defaultdocdir}/bcfg2-examples-%{version}%{?_rc:rc%{_rc}}
%changelog
- * Sun Feb 16 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.1-1
+ * Sat Jul 07 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.3-1
+ - Fix CVE-2012-3366
+ - Updated to new upstream version 1.2.3
+
+ * Tue May 01 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.2-2
+ - python-nose is needed by bcfg2-test
+
+ * Fri Apr 06 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.2-1
+ - Updated to new upstream version 1.2.2
+
+ * Sun Feb 26 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.1-2
+ - Fixed systemd files
+
+ * Tue Feb 07 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.1-1
+ - Added examples package
- Updated to new upstream version 1.2.1
- * Sun Jan 08 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-2
- - Doc subpackage added
+ * Mon Jan 02 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-6
+ - Added support for systemd
+ - Example subpackage
+
+ * Wed Sep 07 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-5
+ - Updated to new upstreadm version 1.2.0
+
+ * Wed Sep 07 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-4.1.rc1
+ - Updated to new upstreadm version 1.2.0rc1
- * Sat Jan 07 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-1
- - New man page and tools added
- - Updated to new upstream version 1.2.0
+ * Wed Jun 22 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-3.1.pre3
+ - Updated to new upstreadm version 1.2.0pre3
- * Thu Sep 22 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.1.3-1
- - Removed patch to fix CVE-2011-3211 (was fixed upstream)
- - Updated to new upstream version 1.1.3
+ * Wed May 04 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-2.1.pre2
+ - Added bcfg2-lint stuff
+ - Pooled file section entries to reduce future maintainance
+ - Removed Patch
- * Wed Sep 07 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.1.2-2
- - Added patch to fix CVE-2011-3211
+ * Wed May 04 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-1.1.pre2
+ - Updated to new upstream version 1.2.0pre2
- * Thu Jun 02 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.1.2-1
- - Updated to new upstream version 1.1.2
- - Pooled file section entries to reduce future maintenance
- - Fixed #683239
+ * Sun Mar 20 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-1.1.pre1
+ - Added doc subpackage
+ - Updated to new upstream version 1.2.0pre1
++>>>>>>> master
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --cc sources
index 61f033f,32de6f2..193528d
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,7 @@@
++<<<<<<< HEAD
+e012c36f3a9586644af776614cab8cfb bcfg2-1.2.1.tar.gz
+766007848bc31878098e32c4d6619ae9 bcfg2-1.2.1.tar.gz.gpg
++=======
+ 3fc592a0dcf859083e12a2ef67d97f5d bcfg2-1.2.3.tar.gz
+ f2da61b2eeb9ced92d527e3a1195c399 bcfg2-1.2.3.tar.gz.gpg
++>>>>>>> master
More information about the scm-commits
mailing list