Merge branch 'f18'

Conflicts:
	pcs.spec
This commit is contained in:
Chris Feist 2013-02-21 18:26:15 -06:00
commit 7d9b392d96
3 changed files with 10 additions and 13 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/pcs-0.9.26.tar.gz
/pcsd.tar.gz
/pcs-0.9.27.tar.gz
/pcs-0.9.32.tar.gz

View File

@ -1,13 +1,12 @@
Name: pcs
Version: 0.9.27
Release: 4%{?dist}
Version: 0.9.32
Release: 1%{?dist}
License: GPLv2
URL: http://github.com/feist/pcs
Group: System Environment/Base
BuildRequires: python2-devel ruby ruby-devel pam-devel
Summary: Pacemaker Configuration System
Source0: http://people.redhat.com/cfeist/pcs/pcs-%{version}.tar.gz
Source1: pcsd.tar.gz
Requires: pacemaker ruby
%description
@ -16,7 +15,6 @@ easily view, modify and created pacemaker based clusters.
%prep
%setup -q
%setup -q -b1
%build
@ -25,16 +23,15 @@ 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
cd pcsd
make build_gems
cd ..
mkdir -p $RPM_BUILD_ROOT/usr/local/
cp -r pcs-gui $RPM_BUILD_ROOT/usr/local/pcsd
cp -r pcsd $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 pcsd/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 pcsd/pcsd.pam $RPM_BUILD_ROOT/etc/pam.d/pcsd
install -d $RPM_BUILD_ROOT/var/lib/pcsd
%files
@ -50,8 +47,8 @@ install -d $RPM_BUILD_ROOT/var/lib/pcsd
%doc COPYING README
%changelog
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.27-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Feb 21 2013 Chris Feist <cfeist@redhat.com> - 0.9.32-1
- Resynced to latest version of pcs/pcsd
* Mon Nov 05 2012 Chris Feist <cfeist@redhat.com> - 0.9.27-3
- Build on all archs

View File

@ -1,2 +1 @@
3722af769f8ececa6b4a442ef0fd5987 pcs-0.9.27.tar.gz
6e4bedeb380f7b720496fb37bc9be7f0 pcsd.tar.gz
a1dce38c748f758a46b4f3edaa5a86ae pcs-0.9.32.tar.gz