From 6436aba4ef560a40d90604545c2e2447a4582c45 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Fri, 20 Apr 2007 15:37:57 +0000
Subject: [PATCH] - Merge review (#226337)

---
 pyparted.spec | 26 ++++++++++++--------------
 sources       |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pyparted.spec b/pyparted.spec
index a058bbf..8e00cf0 100644
--- a/pyparted.spec
+++ b/pyparted.spec
@@ -2,14 +2,15 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.8.6
+Release: 1%{?dist}
 License: GPL
 Group:   System Environment/Libraries
+URL:     http://people.redhat.com/dcantrel/%{name}
 
 Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, parted-devel >= 1.8.6
 Requires: parted >= 1.8.6
 
@@ -21,27 +22,24 @@ partition tables.
 %setup -q
 
 %build
-export CFLAGS="-fPIC -O2 -g2"
-PYVER=$(%{__python} -c "import sys; print sys.version[:3]")
-if [ ! -x configure ]; then
-	./autogen.sh --with-python-version=$PYVER
-fi
-%configure --with-python-version=$PYVER
-make
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING AUTHORS ChangeLog
 %{python_sitearch}/partedmodule.so
 
 %changelog
+* Fri Apr 19 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-1
+- Merge review (#226337)
+
 * Tue Mar 20 2007 David Cantrell <dcantrell@redhat.com> - 1.8.5-4
 - Rebuild for GNU parted-1.8.6
 
diff --git a/sources b/sources
index 2ac3b8f..a4c69f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9097bc19e06350d865db38016ef98f4c  pyparted-1.8.5.tar.gz
+6aae2a503d21044d6354128d99458d11  pyparted-1.8.6.tar.bz2