From 11de3ad6a60b0917e320d9b3db26ba46fccb3ac0 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 16 Dec 2013 11:40:00 -0600 Subject: misc/bcfg2.spec: Use systemd scripts on RHEL7 Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 724cf975b..21307c5ac 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -449,7 +449,7 @@ install -d %{buildroot}/var/adm/fillup-templates mv %{buildroot}%{_bindir}/bcfg2* %{buildroot}%{_sbindir} -%if 0%{?fedora} < 16 +%if 0%{?fedora} && 0%{?fedora} < 16 || 0%{?rhel} && 0%{?rhel} < 7 # Install SysV init scripts for everyone but new Fedoras install -m 755 redhat/scripts/bcfg2.init \ %{buildroot}%{_initrddir}/bcfg2 @@ -651,7 +651,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{_mandir}/man5/bcfg2.conf.5* %ghost %attr(600,root,root) %config(noreplace,missingok) %{_sysconfdir}/bcfg2.cert %ghost %attr(0600,root,root) %config(noreplace,missingok) %{_sysconfdir}/bcfg2.conf -%if 0%{?fedora} >= 16 +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 %config(noreplace) %{_unitdir}/%{name}.service %else %{_initrddir}/bcfg2 @@ -686,7 +686,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %defattr(-,root,root,-) %endif %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.key -%if 0%{?fedora} >= 16 +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 %config(noreplace) %{_unitdir}/%{name}-server.service %else %{_initrddir}/bcfg2-server -- cgit v1.2.3-1-g7c22 From 39b38f5cf18c9bd7f755f4f3bbe3c17ca37cd4fa Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 16 Dec 2013 11:53:15 -0600 Subject: misc/bcfg2.spec: Remove upstream release comments We don't need to make changelog edits every time there's a new release. This just clutters up the changelog without adding any useful information. Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 21307c5ac..15a560593 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -747,9 +747,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog -* Thu Nov 07 2013 Sol Jerome 1.3.3-1 -- New upstream release - * Sun Aug 04 2013 John Morris - 1.3.2-2 - Reconcile divergences with Fedora specfile, as requested by upstream (equally large changes made in Fedora version to reconcile with @@ -768,33 +765,12 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Changes to %%post* scripts - Rearrange %%files sections -* Mon Jul 01 2013 Sol Jerome 1.3.2-1 -- New upstream release - -* Thu Mar 21 2013 Sol Jerome 1.3.1-1 -- New upstream release - -* Fri Mar 15 2013 Sol Jerome 1.3.0-0.0 -- New upstream release - -* Tue Jan 29 2013 Sol Jerome 1.3.0-0.0rc2 -- New upstream release - -* Wed Jan 09 2013 Sol Jerome 1.3.0-0.0rc1 -- New upstream release - -* Tue Oct 30 2012 Sol Jerome 1.3.0-0.0pre2 -- New upstream release - * Wed Oct 17 2012 Chris St. Pierre 1.3.0-0.2pre1 - Split bcfg2-selinux into its own specfile * Fri Sep 14 2012 Chris St. Pierre 1.3.0-0.1pre1 - Added -selinux subpackage -* Fri Aug 31 2012 Sol Jerome 1.3.0-0.0pre1 -- New upstream release - * Wed Aug 15 2012 Chris St. Pierre 1.2.3-0.1 - Added tools/ as doc for bcfg2-server subpackage -- cgit v1.2.3-1-g7c22 From 1e2c612e336e87972d6f2713ebf477df79fe8440 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 24 Jan 2014 09:55:50 -0600 Subject: misc/bcfg2.spec: Fix BuildRequires for RHEL7 Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 15a560593..485c0fb17 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -72,7 +72,12 @@ BuildRequires: python-sqlalchemy BuildRequires: python-nose BuildRequires: mock BuildRequires: m2crypto +# EPEL uses the properly-named python-django start with EPEL7 +%if 0%{?rhel} && 0%{?rhel} > 6 +BuildRequires: python-django +%else BuildRequires: Django +%endif BuildRequires: python-genshi BuildRequires: python-cheetah BuildRequires: pylibacl -- cgit v1.2.3-1-g7c22 From 1103c6dce2af830264d135cafdfbab68f1c5f9a5 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sun, 26 Jan 2014 09:58:54 -0600 Subject: misc/bcfg2.spec: Fix bcfg2-web Requires for EPEL7 Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 485c0fb17..4174bdcb3 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -72,7 +72,7 @@ BuildRequires: python-sqlalchemy BuildRequires: python-nose BuildRequires: mock BuildRequires: m2crypto -# EPEL uses the properly-named python-django start with EPEL7 +# EPEL uses the properly-named python-django starting with EPEL7 %if 0%{?rhel} && 0%{?rhel} > 6 BuildRequires: python-django %else @@ -283,8 +283,13 @@ Requires: python-django >= 1.2 Requires: python-django-south >= 0.7 %else Group: System Tools +# EPEL uses the properly-named python-django starting with EPEL7 +%if 0%{?rhel} && 0%{?rhel} > 6 +Requires: python-django +%else Requires: Django >= 1.2 Requires: Django-south >= 0.7 +%endif Requires: bcfg2-server %endif Requires: httpd -- cgit v1.2.3-1-g7c22 From 3aa84b4aeb5cc666b78e177dc2d6a941403bc94d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sun, 26 Jan 2014 10:01:19 -0600 Subject: misc/bcfg2.spec: Pull in cherrypy toggle from epel This allows one to disable building of the bcfg2-server-cherrypy package. Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 4174bdcb3..e7000eec2 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -22,6 +22,12 @@ #%%global _pre 2 %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} +# cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that +# prevent it from working: +# https://bitbucket.org/cherrypy/cherrypy/issue/1154/assertionerror-in-recv-when-ssl-is-enabled +%global build_cherry_py 0 + + Name: bcfg2 Version: 1.3.3 Release: 1%{?_pre_rc}%{?dist} @@ -54,7 +60,9 @@ BuildRequires: python-Genshi BuildRequires: python-gamin BuildRequires: python-pyinotify BuildRequires: python-python-daemon +%if %{build_cherry_py} BuildRequires: python-CherryPy >= 3 +%endif %else # ! suse_version BuildRequires: python-daemon BuildRequires: python-inotify @@ -83,7 +91,9 @@ BuildRequires: python-cheetah BuildRequires: pylibacl BuildRequires: libselinux-python BuildRequires: python-pep8 +%if %{build_cherry_py} BuildRequires: python-cherrypy >= 3 +%endif BuildRequires: python-mock BuildRequires: pylint %endif # rhel > 5 @@ -231,6 +241,7 @@ deployment strategies. This package includes the Bcfg2 server software. +%if %{build_cherry_py} %package server-cherrypy Summary: Bcfg2 Server - CherryPy backend %if 0%{?suse_version} @@ -273,6 +284,8 @@ Bcfg2 can enable the construction of complex change management and deployment strategies. This package includes the Bcfg2 CherryPy server backend. +%endif # build_cherry_py + %package web Summary: Bcfg2 Web Reporting Interface @@ -713,7 +726,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{python_sitelib}/Bcfg2/Server %{python_sitelib}/Bcfg2/Reporting %{python_sitelib}/Bcfg2/manage.py* -%exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py +%exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py* %dir %{_datadir}/bcfg2 %{_datadir}/bcfg2/schemas @@ -729,11 +742,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %doc tools/* +%if %{build_cherry_py} %files server-cherrypy %if 0%{?rhel} == 5 || 0%{?suse_version} %defattr(-,root,root,-) %endif %{python_sitelib}/Bcfg2/Server/CherryPyCore.py +%endif %files web %if 0%{?rhel} == 5 || 0%{?suse_version} -- cgit v1.2.3-1-g7c22 From c8b39ab597d50dc1889ac9448700a2b378b6ffdf Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sun, 26 Jan 2014 10:14:39 -0600 Subject: misc/bcfg2.spec: Merge changelog from epel Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index e7000eec2..1c4337421 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -772,6 +772,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Sun Dec 15 2013 John Morris - 1.3.3-3 +- Remove unneeded Django dep in 'web' package, bz #1043229 + +* Sun Nov 24 2013 John Morris - 1.3.3-2 +- Fix CherryPyCore.py exclude glob to include compiled files +- Disable server-cherrypy package build to make Fedora buildsys happy + * Sun Aug 04 2013 John Morris - 1.3.2-2 - Reconcile divergences with Fedora specfile, as requested by upstream (equally large changes made in Fedora version to reconcile with @@ -790,9 +797,55 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Changes to %%post* scripts - Rearrange %%files sections +* Wed Jul 3 2013 John Morris - 1.3.2-1 +- Update to new upstream version 1.3.2 +- Move settings.py into server package (fixes bug reported on bcfg2-dev ML) +- Use init scripts from redhat/scripts directory +- Fix EL5/EL6 sphinx docs +- Require python-inotify instead of gamin-python; recommended by upstream +- Remove obsolete bcfg2-py27-auth.patch, accepted upstream +- Add %%check script + - Hack test suite to use local copies of XMLSchema.xsd and xml.xsd + - Many new BRs to support %%check script + - Disable %%check script on EL5, where there is no python-mock package +- Cleanups to _pre/_rc macros +- Mark EL5 relics +- Other minor formatting + +* Mon Apr 08 2013 Fabian Affolter - 1.3.1-1 +- Updated to new upstream version 1.3.1 + +* Mon Mar 18 2013 Fabian Affolter - 1.3.0-1 +- Updated to new upstream version 1.3.0 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.3.0-0.2.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Oct 31 2012 Fabian Affolter - 1.3.0-0.1.pre2 +- Updated to new upstream version 1.3.0 pre2 + * Wed Oct 17 2012 Chris St. Pierre 1.3.0-0.2pre1 - Split bcfg2-selinux into its own specfile +* Mon Aug 27 2012 Václav Pavlín - 1.2.3-3 +- Scriptlets replaced with new systemd macros (#850043) + +* Wed Jul 18 2012 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jul 07 2012 Fabian Affolter - 1.2.3-1 +- Fix CVE-2012-3366 +- Updated to new upstream version 1.2.3 + +* Tue May 01 2012 Fabian Affolter - 1.2.2-2 +- python-nose is needed by bcfg2-test + +* Fri Apr 06 2012 Fabian Affolter - 1.2.2-1 +- Updated to new upstream version 1.2.2 + +* Sun Feb 26 2012 Fabian Affolter - 1.2.1-2 +- Fixed systemd files + * Fri Sep 14 2012 Chris St. Pierre 1.3.0-0.1pre1 - Added -selinux subpackage @@ -807,15 +860,212 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Added openSUSE compatibility. - Various changes to satisfy rpmlint. +* Tue Feb 07 2012 Fabian Affolter - 1.2.1-1 +- Added examples package +- Updated to new upstream version 1.2.1 + +* Mon Jan 02 2012 Fabian Affolter - 1.2.0-6 +- Added support for systemd +- Example subpackage + +* Wed Sep 07 2011 Fabian Affolter - 1.2.0-5 +- Updated to new upstreadm version 1.2.0 + +* Wed Sep 07 2011 Fabian Affolter - 1.2.0-4.1.rc1 +- Updated to new upstreadm version 1.2.0rc1 + +* Wed Jun 22 2011 Fabian Affolter - 1.2.0-3.1.pre3 +- Updated to new upstreadm version 1.2.0pre3 + +* Wed May 04 2011 Fabian Affolter - 1.2.0-2.1.pre2 +- Added bcfg2-lint stuff +- Pooled file section entries to reduce future maintainance +- Removed Patch + +* Wed May 04 2011 Fabian Affolter - 1.2.0-1.1.pre2 +- Updated to new upstream version 1.2.0pre2 + +* Sun Mar 20 2011 Fabian Affolter - 1.2.0-1.1.pre1 +- Added doc subpackage +- Updated to new upstream version 1.2.0pre1 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jan 27 2011 Chris St. Pierre 1.2.0pre1-0.0 - Added -doc sub-package +* Thu Nov 18 2010 Fabian Affolter - 1.1.1-2 +- Added new man page +- Updated doc section (ChangeLog is gone) + +* Thu Nov 18 2010 Fabian Affolter - 1.1.1-1 +- Updated to new upstream version 1.1.1 + +* Fri Nov 5 2010 Jeffrey C. Ollie - 1.1.0-3 +- Add patch from Gordon Messmer to fix authentication on F14+ (Python 2.7) + +* Mon Sep 27 2010 Jeffrey C. Ollie - 1.1.0-2 +- Update to final version + +* Wed Sep 15 2010 Jeffrey C. Ollie - 1.1.0-1.3.rc5 +- Update to 1.1.0rc5: + +* Tue Aug 31 2010 Jeffrey C. Ollie - 1.1.0-1.2.rc4 +- Add new YUMng driver + +* Wed Jul 21 2010 David Malcolm - 1.1.0-1.1.rc4.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jul 20 2010 Fabian Affolter - 1.1.0-1.1.rc4 +- Added patch to fix indention + +* Tue Jul 20 2010 Fabian Affolter - 1.1.0-0.1.rc4 +- Updated to new upstream release candidate RC4 + * Mon Jun 21 2010 Fabian Affolter - 1.1.0rc3-0.1 - Changed source0 in order that it works with spectool +* Sat Jun 19 2010 Fabian Affolter - 1.1.0-0.1.rc3 +- Updated to new upstream release candidate RC3 + +* Sun May 02 2010 Fabian Affolter - 1.1.0-0.2.rc1 +- Changed define to global +- Added graphviz for the server package + +* Wed Apr 28 2010 Jeffrey C. Ollie - 1.1.0-0.1.rc1 +- Update to 1.1.0rc1 + +* Tue Apr 13 2010 Jeffrey C. Ollie - 1.0.1-1 +- Update to final version + +* Fri Nov 6 2009 Jeffrey C. Ollie - 1.0.0-2 +- Fixup the bcfg2-server init script + +* Fri Nov 6 2009 Jeffrey C. Ollie - 1.0.0-1 +- Update to 1.0.0 final + +* Wed Nov 4 2009 Jeffrey C. Ollie - 1.0.0-0.5.rc2 +- Only require python-ssl on EPEL + +* Sat Oct 31 2009 Jeffrey C. Ollie - 1.0.0-0.4.rc2 +- Update to 1.0.0rc2 + +* Mon Oct 26 2009 Jeffrey C. Ollie - 1.0.0-0.3.rc1 +- Update to 1.0rc1 + +* Fri Oct 16 2009 Jeffrey C. Ollie - 1.0-0.2.pre5 +- Add python-ssl requirement + +* Tue Aug 11 2009 Jeffrey C. Ollie - 1.0-0.1.pre5 +- Update to 1.0pre5 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.9.6-2 +- Rebuild for Python 2.6 + +* Tue Nov 18 2008 Jeffrey C. Ollie - 0.9.6-1 +- Update to 0.9.6 final. + +* Tue Oct 14 2008 Jeffrey C. Ollie - 0.9.6-0.8.pre3 +- Update to 0.9.6pre3 + +* Sat Aug 9 2008 Jeffrey C. Ollie - 0.9.6-0.2.pre2 +- Update to 0.9.6pre2 + +* Wed May 28 2008 Jeffrey C. Ollie - 0.9.6-0.1.pre1 +- Update to 0.9.6pre1 + +* Fri Feb 15 2008 Jeffrey C. Ollie - 0.9.5.7-1 +- Update to 0.9.5.7. + +* Fri Feb 15 2008 Jeffrey C. Ollie - 0.9.5.7-1 +- Update to 0.9.5.7. + +* Fri Jan 11 2008 Jeffrey C. Ollie - 0.9.5.5-1 +- Update to 0.9.5.5 +- More egg-info entries. + +* Wed Jan 9 2008 Jeffrey C. Ollie - 0.9.5.4-1 +- Update to 0.9.5.4. + +* Tue Jan 8 2008 Jeffrey C. Ollie - 0.9.5.3-1 +- Update to 0.9.5.3 +- Package egg-info files. + +* Mon Nov 12 2007 Jeffrey C. Ollie - 0.9.5.2-1 +- Update to 0.9.5.2 + +* Mon Nov 12 2007 Jeffrey C. Ollie - 0.9.5-2 +- Fix oops. + +* Mon Nov 12 2007 Jeffrey C. Ollie - 0.9.5-1 +- Update to 0.9.5 final. + +* Mon Nov 05 2007 Jeffrey C. Ollie - 0.9.5-0.5.pre7 +- Commit new patches to CVS. + +* Mon Nov 05 2007 Jeffrey C. Ollie - 0.9.5-0.4.pre7 +- Update to 0.9.5pre7 + +* Wed Jun 27 2007 Jeffrey C. Ollie - 0.9.4-4 +- Oops, apply right patch + +* Wed Jun 27 2007 Jeffrey C. Ollie - 0.9.4-3 +- Add patch to fix YUMng problem + +* Mon Jun 25 2007 Jeffrey C. Ollie - 0.9.4-2 +- Bump revision and rebuild + +* Mon Jun 25 2007 Jeffrey C. Ollie - 0.9.4-1 +- Update to 0.9.4 final + +* Thu Jun 21 2007 Jeffrey C. Ollie - 0.9.4-0.1.pre4 +- Update to 0.9.4pre4 + +* Thu Jun 14 2007 Jeffrey C. Ollie - 0.9.4-0.1.pre3 +- Update to 0.9.4pre3 + +* Tue Jun 12 2007 Jeffrey C. Ollie - 0.9.4-0.1.pre2 +- Update to 0.9.4pre2 + +* Tue May 22 2007 Jeffrey C. Ollie - 0.9.3-2 +- Drop requires on pyOpenSSL +- Add requires on redhat-lsb +- (Fixes #240871) + +* Mon Apr 30 2007 Jeffrey C. Ollie - 0.9.3-1 +- Update to 0.9.3 + +* Tue Mar 20 2007 Jeffrey C. Ollie - 0.9.2-4 +- Server needs pyOpenSSL + +* Wed Feb 28 2007 Jeffrey C. Ollie - 0.9.2-3 +- Don't forget %%dir + +* Wed Feb 28 2007 Jeffrey C. Ollie - 0.9.2-2 +- Fix #230478 + +* Mon Feb 19 2007 Jeffrey C. Ollie - 0.9.2-1 +- Update to 0.9.2 + +* Thu Feb 8 2007 Jeffrey C. Ollie - 0.9.1-1.d +- Update to 0.9.1d + * Fri Feb 2 2007 Mike Brady 0.9.1 - Removed use of _libdir due to Red Hat x86_64 issue. +* Tue Jan 9 2007 Jeffrey C. Ollie - 0.8.7.3-2 +- Merge client back into base package. + +* Wed Dec 27 2006 Jeffrey C. Ollie - 0.8.7.3-1 +- Update to 0.8.7.3 + * Fri Dec 22 2006 Jeffrey C. Ollie - 0.8.7.1-5 - Server needs client library files too so put them in main package -- cgit v1.2.3-1-g7c22 From c5ad7f0edbdbfcb38506b97a92001a9624e36f6b Mon Sep 17 00:00:00 2001 From: John Morris Date: Mon, 3 Feb 2014 11:58:03 -0600 Subject: misc/bcfg2.spec: merge recent Fedora changes Summary: EPEL7 updates; EPEL5 bcfg2-web pkg disabled; CherryPy disabled * Sat Feb 1 2014 John Morris - 1.3.3-4 - Disable bcfg2-web package on EL5; bz #1058427 - Disable %%check on EL7; missing EPEL deps - BR: systemd to pick up _unitdir macro * Mon Jan 27 2014 Sol Jerome - 1.3.3-4 - Fix BuildRequires for EPEL7's Django - Remove unnecessary client-side lxml dependency - Add Django dependency for bcfg2-web (the web package *does* require Django for the database) - Fix OS detection for RHEL7 initscripts * Sun Dec 15 2013 John Morris - 1.3.3-3 - Remove unneeded Django dep in 'web' package, bz #1043229 * Sun Nov 24 2013 John Morris - 1.3.3-2 - Fix CherryPyCore.py exclude glob to include compiled files - Disable server-cherrypy package build to make Fedora buildsys happy * Thu Nov 07 2013 Sol Jerome 1.3.3-1 - New upstream release --- misc/bcfg2.spec | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 1c4337421..bf37f030a 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -30,7 +30,7 @@ Name: bcfg2 Version: 1.3.3 -Release: 1%{?_pre_rc}%{?dist} +Release: 3%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} @@ -41,7 +41,7 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz # Used in %%check Source1: http://www.w3.org/2001/XMLSchema.xsd %if %{?rhel}%{!?rhel:10} <= 5 || 0%{?suse_version} @@ -88,17 +88,25 @@ BuildRequires: Django %endif BuildRequires: python-genshi BuildRequires: python-cheetah -BuildRequires: pylibacl BuildRequires: libselinux-python +%if 0%{?rhel} != 7 +# FIXME: Not yet present in EPEL7; for %%check +BuildRequires: pylibacl BuildRequires: python-pep8 +BuildRequires: pylint +%endif %if %{build_cherry_py} BuildRequires: python-cherrypy >= 3 %endif BuildRequires: python-mock -BuildRequires: pylint %endif # rhel > 5 %endif # vendor != redhat || rhel defined %endif # ! suse_version +%if 0%{?fedora} && 0%{?fedora} >= 16 || 0%{?rhel} && 0%{?rhel} >= 7 +# Pick up _unitdir macro +BuildRequires: systemd +%endif + %if 0%{?mandriva_version} # mandriva seems to behave differently than other distros and needs @@ -510,10 +518,17 @@ install -p -m 644 redhat/systemd/%{name}.service \ install -p -m 644 redhat/systemd/%{name}-server.service \ %{buildroot}%{_unitdir}/%{name}-server.service +%if 0%{?rhel} != 5 # Webserver install -d %{buildroot}%{apache_conf}/conf.d install -p -m 644 misc/apache/bcfg2.conf \ %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf +%else +# remove web server files not in EL5 packages +rm -r %{buildroot}%{_datadir}/bcfg2/reports.wsgi \ + %{buildroot}%{_datadir}/bcfg2/site_media +%endif + # mandriva cannot handle %ghost without the file existing, # so let's touch a bunch of empty config files @@ -528,6 +543,8 @@ rm -rf %{buildroot} %if 0%{?rhel} != 5 # EL5 lacks python-mock, so test suite is disabled +%if 0%{?rhel} != 7 +# FIXME: EL7 has some missing EPEL deps, so test suite is disabled %check # Downloads not allowed in koji; fix .xsd urls to point to local files sed -i "s@schema_url = .*\$@schema_url = 'file://`pwd`/`basename %{SOURCE1}`'@" \ @@ -536,6 +553,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{SOURCE1} > `basename %{SOURCE1}` %{__python} setup.py test %endif +%endif %post @@ -750,13 +768,16 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{python_sitelib}/Bcfg2/Server/CherryPyCore.py %endif +# bcfg2-web package is disabled on EL5, which lacks Django +%if 0%{?rhel} != 5 %files web -%if 0%{?rhel} == 5 || 0%{?suse_version} +%if 0%{?suse_version} %defattr(-,root,root,-) %endif %{_datadir}/bcfg2/reports.wsgi %{_datadir}/bcfg2/site_media %config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf +%endif %files doc %if 0%{?rhel} == 5 || 0%{?suse_version} @@ -772,6 +793,18 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Sat Feb 1 2014 John Morris - 1.3.3-4 +- Disable bcfg2-web package on EL5; bz #1058427 +- Disable %%check on EL7; missing EPEL deps +- BR: systemd to pick up _unitdir macro + +* Mon Jan 27 2014 Sol Jerome - 1.3.3-4 +- Fix BuildRequires for EPEL7's Django +- Remove unnecessary client-side lxml dependency +- Add Django dependency for bcfg2-web (the web package *does* require + Django for the database) +- Fix OS detection for RHEL7 initscripts + * Sun Dec 15 2013 John Morris - 1.3.3-3 - Remove unneeded Django dep in 'web' package, bz #1043229 @@ -779,6 +812,9 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Fix CherryPyCore.py exclude glob to include compiled files - Disable server-cherrypy package build to make Fedora buildsys happy +* Thu Nov 07 2013 Sol Jerome 1.3.3-1 +- New upstream release + * Sun Aug 04 2013 John Morris - 1.3.2-2 - Reconcile divergences with Fedora specfile, as requested by upstream (equally large changes made in Fedora version to reconcile with -- cgit v1.2.3-1-g7c22 From 4e26cdfdc809818294879f660727759838f8face Mon Sep 17 00:00:00 2001 From: John Morris Date: Mon, 3 Feb 2014 12:20:15 -0600 Subject: misc/bcfg2.spec: Bump release Forgot this somewhere; already bumped in %changelog --- misc/bcfg2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index bf37f030a..946b1d4a9 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -30,7 +30,7 @@ Name: bcfg2 Version: 1.3.3 -Release: 3%{?_pre_rc}%{?dist} +Release: 4%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} -- cgit v1.2.3-1-g7c22 From 21085413a415062cf02ff299cb4753e7737fb32c Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 13 Feb 2014 07:56:04 -0500 Subject: misc: build requires gamin-python to properly generate docs --- misc/bcfg2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 946b1d4a9..61f80d378 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -64,6 +64,7 @@ BuildRequires: python-python-daemon BuildRequires: python-CherryPy >= 3 %endif %else # ! suse_version +BuildRequires: gamin-python BuildRequires: python-daemon BuildRequires: python-inotify %if "%{_vendor}" == "redhat" && 0%{!?rhel:1} && 0%{!?fedora:1} @@ -963,7 +964,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Changed source0 in order that it works with spectool * Sat Jun 19 2010 Fabian Affolter - 1.1.0-0.1.rc3 -- Updated to new upstream release candidate RC3 +- Updated to new upstream release candidate RC3 * Sun May 02 2010 Fabian Affolter - 1.1.0-0.2.rc1 - Changed define to global -- cgit v1.2.3-1-g7c22 From fd6ed3a57c2ef593e77e445a98580227c26d2dde Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 13 Feb 2014 10:38:04 -0500 Subject: misc: only require gamin for building on RHEL < 7 --- misc/bcfg2.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 61f80d378..b2f3fd641 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -64,7 +64,6 @@ BuildRequires: python-python-daemon BuildRequires: python-CherryPy >= 3 %endif %else # ! suse_version -BuildRequires: gamin-python BuildRequires: python-daemon BuildRequires: python-inotify %if "%{_vendor}" == "redhat" && 0%{!?rhel:1} && 0%{!?fedora:1} @@ -86,16 +85,16 @@ BuildRequires: m2crypto BuildRequires: python-django %else BuildRequires: Django -%endif -BuildRequires: python-genshi -BuildRequires: python-cheetah -BuildRequires: libselinux-python -%if 0%{?rhel} != 7 +# FIXME: Not yet present in EPEL7; for building docs +BuildRequires: gamin-python # FIXME: Not yet present in EPEL7; for %%check BuildRequires: pylibacl BuildRequires: python-pep8 BuildRequires: pylint %endif +BuildRequires: python-genshi +BuildRequires: python-cheetah +BuildRequires: libselinux-python %if %{build_cherry_py} BuildRequires: python-cherrypy >= 3 %endif -- cgit v1.2.3-1-g7c22 From e48fe708f6d40badaa778e2af48afb4c5b522190 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 25 Feb 2014 12:32:16 -0600 Subject: bcfg2.spec: Fix changelog date order Signed-off-by: Sol Jerome --- misc/bcfg2.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index b2f3fd641..61bedee61 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -863,9 +863,15 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ * Wed Oct 17 2012 Chris St. Pierre 1.3.0-0.2pre1 - Split bcfg2-selinux into its own specfile +* Fri Sep 14 2012 Chris St. Pierre 1.3.0-0.1pre1 +- Added -selinux subpackage + * Mon Aug 27 2012 Václav Pavlín - 1.2.3-3 - Scriptlets replaced with new systemd macros (#850043) +* Wed Aug 15 2012 Chris St. Pierre 1.2.3-0.1 +- Added tools/ as doc for bcfg2-server subpackage + * Wed Jul 18 2012 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -882,12 +888,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ * Sun Feb 26 2012 Fabian Affolter - 1.2.1-2 - Fixed systemd files -* Fri Sep 14 2012 Chris St. Pierre 1.3.0-0.1pre1 -- Added -selinux subpackage - -* Wed Aug 15 2012 Chris St. Pierre 1.2.3-0.1 -- Added tools/ as doc for bcfg2-server subpackage - * Sat Feb 18 2012 Christopher 'm4z' Holm <686f6c6d@googlemail.com> 1.2.1 - Added Fedora and Mandriva compatibilty (for Open Build Service). - Added missing dependency redhat-lsb. -- cgit v1.2.3-1-g7c22 From 74fd7a8e65ac9737a6ab39afa3378ca63fbe4e21 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 25 Feb 2014 13:25:16 -0600 Subject: Version bump to 1.3.4 Signed-off-by: Sol Jerome --- misc/bcfg2-selinux.spec | 4 ++-- misc/bcfg2.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index d694783b5..d33953e08 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -16,7 +16,7 @@ %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} Name: bcfg2-selinux -Version: 1.3.3 +Version: 1.3.4 Release: 1%{?_pre_rc}%{?dist} Summary: Bcfg2 Client and Server SELinux policy @@ -32,7 +32,7 @@ Conflicts: selinux-policy = 3.11.1 License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 61bedee61..f271427b3 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -29,8 +29,8 @@ Name: bcfg2 -Version: 1.3.3 -Release: 4%{?_pre_rc}%{?dist} +Version: 1.3.4 +Release: 1%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} -- cgit v1.2.3-1-g7c22 From 2609e3304a7b4a34cdada81cf25722c52de30a2a Mon Sep 17 00:00:00 2001 From: John Morris Date: Thu, 27 Feb 2014 11:29:17 -0600 Subject: misc/bcfg2.spec: reconcile w/Fedora: re-enable unit tests in EL7 EL7 deps needed for unit tests (pylibacl, python-pep8, pylint) now built for EPEL7. https://bugzilla.redhat.com/show_bug.cgi?id=1058427 --- misc/bcfg2.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index f271427b3..6a4153472 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -85,16 +85,13 @@ BuildRequires: m2crypto BuildRequires: python-django %else BuildRequires: Django -# FIXME: Not yet present in EPEL7; for building docs -BuildRequires: gamin-python -# FIXME: Not yet present in EPEL7; for %%check -BuildRequires: pylibacl -BuildRequires: python-pep8 -BuildRequires: pylint %endif BuildRequires: python-genshi BuildRequires: python-cheetah BuildRequires: libselinux-python +BuildRequires: pylibacl +BuildRequires: python-pep8 +BuildRequires: pylint %if %{build_cherry_py} BuildRequires: python-cherrypy >= 3 %endif @@ -543,8 +540,6 @@ rm -rf %{buildroot} %if 0%{?rhel} != 5 # EL5 lacks python-mock, so test suite is disabled -%if 0%{?rhel} != 7 -# FIXME: EL7 has some missing EPEL deps, so test suite is disabled %check # Downloads not allowed in koji; fix .xsd urls to point to local files sed -i "s@schema_url = .*\$@schema_url = 'file://`pwd`/`basename %{SOURCE1}`'@" \ @@ -553,7 +548,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{SOURCE1} > `basename %{SOURCE1}` %{__python} setup.py test %endif -%endif %post @@ -793,6 +787,12 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Sun Apr 6 2014 John Morris - 1.3.4-1 +- New upstream release + +* Wed Feb 26 2014 John Morris - 1.3.3-5 +- EL7: Re-add deps and re-enable %%check script; bz #1058427 + * Sat Feb 1 2014 John Morris - 1.3.3-4 - Disable bcfg2-web package on EL5; bz #1058427 - Disable %%check on EL7; missing EPEL deps -- cgit v1.2.3-1-g7c22