[pcs/f18] Sync to upstream sources
cfeist
cfeist at fedoraproject.org
Tue Oct 16 22:58:43 UTC 2012
commit edefe503d370cce1a28db0f6847b83329aa25010
Author: Chris Feist <cfeist at redhat.com>
Date: Tue Oct 16 17:58:38 2012 -0500
Sync to upstream sources
.gitignore | 2 ++
pcs.spec | 33 +++++++++++++++++++++++++--------
sources | 3 ++-
3 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d3d13c..4b0e7c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
/pcs-0.9.23.tar.gz
/pcs-0.9.24.tar.gz
/pcs-0.9.26.tar.gz
+/pcsd.tar.gz
+/pcs-0.9.27.tar.gz
diff --git a/pcs.spec b/pcs.spec
index e2b5b2e..4a762fb 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,15 +1,15 @@
Name: pcs
-Version: 0.9.26
+Version: 0.9.27
Release: 1%{?dist}
License: GPLv2
URL: http://github.com/feist/pcs
Group: System Environment/Base
-BuildArch: noarch
-BuildRequires: python2-devel
+BuildArch: x86_64 i686
+BuildRequires: python2-devel ruby
Summary: Pacemaker Configuration System
Source0: http://people.redhat.com/cfeist/pcs/pcs-%{version}.tar.gz
-
-Requires: pacemaker
+Source1: pcsd.tar.gz
+Requires: pacemaker ruby
%description
pcs is a corosync and pacemaker configuration tool. It permits users to
@@ -17,27 +17,44 @@ easily view, modify and created pacemaker based clusters.
%prep
%setup -q
-
+%setup -q -b1
%build
-
%install
rm -rf $RPM_BUILD_ROOT
pwd
make install DESTDIR=$RPM_BUILD_ROOT PYTHON_SITELIB=%{python_sitelib}
chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
-
+cd ..
+cd pcs-gui
+make build_gems
+cd ..
+mkdir -p $RPM_BUILD_ROOT/usr/local/
+cp -r pcs-gui $RPM_BUILD_ROOT/usr/local/pcsd
+install -d $RPM_BUILD_ROOT/usr/lib/systemd/system/
+install pcs-gui/pcsd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/
+install -d $RPM_BUILD_ROOT/etc/pam.d
+install pcs-gui/pcsd.pam $RPM_BUILD_ROOT/etc/pam.d/pcsd
+install -d $RPM_BUILD_ROOT/var/lib/pcsd
%files
%defattr(-,root,root,-)
%{python_sitelib}/pcs
%{python_sitelib}/pcs-%{version}-py2.*.egg-info
/usr/sbin/pcs
+/usr/local/pcsd/*
+/usr/lib/systemd/system/pcsd.service
+/var/lib/pcsd
+/etc/pam.d/pcsd
%doc COPYING README
%changelog
+* Tue Oct 16 2012 Chris Feist <cfeist at redhat.cmo> - 0.9.27-1
+- Resync to latest version of pcs
+- Added pcsd daemon
+
* Mon Oct 08 2012 Chris Feist <cfeist at redhat.cmo> - 0.9.26-1
- Resync to latest version of pcs
diff --git a/sources b/sources
index 0c0d54a..c45a817 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-3ee1e50fb49f113983cd03bffe281df2 pcs-0.9.26.tar.gz
+fcdbbe21043dbbfff0e3b83b07267d4f pcsd.tar.gz
+3722af769f8ececa6b4a442ef0fd5987 pcs-0.9.27.tar.gz
More information about the scm-commits
mailing list