[bcfg2/f14: 13/14] Merge branch 'master' into f14

Fabian Affolter fab at fedoraproject.org
Thu Jun 2 12:19:28 UTC 2011 

commit 488f64ea3aa5c8f2a7ea63b10c85d71964a4d52b
Merge: e7c34a5 323d4b8
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Thu Jun 2 14:18:14 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	bcfg2.spec
    	sources

 .gitignore |    6 ++++
 bcfg2.spec |   87 ++++++++++++++++++++++++++++++-----------------------------
 sources    |    5 +++
 3 files changed, 55 insertions(+), 43 deletions(-)
---
diff --cc bcfg2.spec
index 4530f78,b7316ce..837c3b7
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@@ -1,20 -1,24 +1,19 @@@
  %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
- 
- #global _rc 5
 -%{!?py_ver: %define py_ver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
++%{!?py_ver: %global py_ver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+ %global pythonversion %{py_ver}
 -#%global _rc 1
 -%global _pre 2
  
  Name:             bcfg2
- Version:          1.1.1
- Release:          2%{?_rc:.rc%{_rc}}%{?dist}
 -Version:          1.2.0
 -#Release:          1%{?_rc:.rc%{_rc}}%{?dist}
 -Release:          2%{?_pre:.pre%{_pre}}%{?dist}
++Version:          1.1.2
++Release:          1%{?dist}
  Summary:          Configuration management system
  
  Group:            Applications/System
  License:          BSD
--URL:              http://trac.mcs.anl.gov/projects/bcfg2
- Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_rc:rc%{_rc}}.tar.gz
- Source1:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_rc:rc%{_rc}}.tar.gz.gpg
- Patch0:           bcfg2-py27-auth.patch
 -#Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_rc:rc%{_rc}}.tar.gz
 -#Source1:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_rc:rc%{_rc}}.tar.gz.gpg
 -Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_pre:pre%{_pre}}.tar.gz
 -Source1:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_pre:pre%{_pre}}.tar.gz.gpg
++URL:              http://bcfg2.org
++Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz
++Source1:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz.gpg
  BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:        noarch
  
@@@ -79,9 -83,19 +78,19 @@@ Requires(postun): /sbin/servic
  %description server
  Configuration management server
  
+ %package doc
+ Summary:          Documentation for Bcfg2
+ Group:            System
+ 
+ BuildRequires:    python-sphinx
+ BuildRequires:    python-docutils
+ 
+ %description doc
+ Documentation for Bcfg2.
+ 
  %prep
- %setup0 -q -n %{name}-%{version}%{?_rc:rc%{_rc}}
- %patch0 -p1
+ #%setup -q -n %{name}-%{version}%{?_rc:rc%{_rc}}
 -%setup -q -n %{name}-%{version}%{?_pre:pre%{_pre}}
++%setup -q -n %{name}-%{version}
  
  # fixup some paths
  %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/bcfg2.init
@@@ -103,7 -117,15 +112,13 @@@ don
  
  %build
  %{__python} -c 'import setuptools; execfile("setup.py")' build
+ #%{__python} -c 'import setuptools; execfile("setup.py")' build_dtddoc
+ %{__python} -c 'import setuptools; execfile("setup.py")' build_sphinx
+ 
 -
+ #%{?pythonpath: export PYTHONPATH="%{pythonpath}"}
+ #%{__python}%{pythonversion} setup.py build_dtddoc
+ #%{__python}%{pythonversion} setup.py build_sphinx
  
 -
  %install
  rm -rf %{buildroot}
  %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
@@@ -132,6 -155,9 +148,9 @@@ touch %{buildroot}%{_sysconfdir}/bcfg2.
  touch %{buildroot}%{_sysconfdir}/bcfg2.conf
  touch %{buildroot}%{_sysconfdir}/bcfg2.key
  
 -mv build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre:pre%{_pre}}
++mv build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}
+ #mv build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}/
+ 
  %clean
  rm -rf %{buildroot}
  
@@@ -190,42 -217,35 +210,23 @@@ f
  
  %files server
  %defattr(-,root,root,-)
- 
+ %{_mandir}/man8/bcfg2*.8*
  %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.key
- 
  %config(noreplace) %{_sysconfdir}/sysconfig/bcfg2-server
- 
  %{_initrddir}/bcfg2-server
- 
- %{python_sitelib}/Bcfg2/Server
- 
  %{_datadir}/bcfg2
- 
- %{_sbindir}/bcfg2-admin
- %{_sbindir}/bcfg2-build-reports
- %{_sbindir}/bcfg2-info
- %{_sbindir}/bcfg2-ping-sweep
- %{_sbindir}/bcfg2-repo-validate
- %{_sbindir}/bcfg2-reports
- %{_sbindir}/bcfg2-server
- 
- %{_mandir}/man8/bcfg2-admin.8*
- %{_mandir}/man8/bcfg2-build-reports.8*
- %{_mandir}/man8/bcfg2-info.8*
- %{_mandir}/man8/bcfg2-repo-validate.8*
- %{_mandir}/man8/bcfg2-reports.8*
- %{_mandir}/man8/bcfg2-server.8*
- 
+ %{_sbindir}/bcfg2-*
  %dir %{_var}/lib/bcfg2
+ %{python_sitelib}/Bcfg2/Server
+ 
+ %files doc
+ %defattr(-,root,root,-)
 -%doc %{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre:pre%{_pre}}
++%doc %{_defaultdocdir}/bcfg2-doc-%{version}
  
  %changelog
 -* Wed May 04 2011 Fabian Affolter <fabian at bernewireless.net> - 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 <fabian at bernewireless.net> - 1.2.0-1.1.pre2
 -- Updated to new upstream version 1.2.0pre2
 -
 -* Sun Mar 20 2011 Fabian Affolter <fabian at bernewireless.net> - 1.2.0-1.1.pre1
 -- Added doc subpackage
 -- Updated to new upstream version 1.2.0pre1
 -
 -* 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
++* Thu Jun 02 2011 Fabian Affolter <fabian at bernewireless.net> - 1.1.2-1
++- Updated to new upstream version 1.1.2
+ 
  * Thu Nov 18 2010 Fabian Affolter <fabian at bernewireless.net> - 1.1.1-2
  - Added new man page
  - Updated doc section (ChangeLog is gone)
diff --cc sources
index 33a03fb,d4c6591..babae6f
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,7 @@@
++<<<<<<< HEAD
 +f8889d629245ecf67994469ed78fbfeb  bcfg2-1.1.1.tar.gz
 +473ffbb77da5f0c0779ca930363bc109  bcfg2-1.1.1.tar.gz.gpg
++=======
+ 46a0f746dc6b6cdc694e3cf0cafbf05e  bcfg2-1.2.0pre2.tar.gz
+ b0cb91cf0340dd3636e23dd066adbd21  bcfg2-1.2.0pre2.tar.gz.gpg
++>>>>>>> master

More information about the scm-commits mailing list