[gquilt] New upstream release Update spec to match current guidelines Fix relevant rpmlint errors and warning

[Rahul Sundaram]

commit e22f000d32120c3bdf122bd5619d114a931e9a6d
Author: Rahul <sundaram at fedoraproject.org>
Date:   Wed Mar 30 01:02:52 2011 +0530

    New upstream release
    Update spec to match current guidelines
    Fix relevant rpmlint errors and warnings

 gquilt.spec |   51 +++++++++++++++++++++++++--------------------------
 sources     |    2 +-
 2 files changed, 26 insertions(+), 27 deletions(-)
---
diff --git a/gquilt.spec b/gquilt.spec
index dd5cf52..384e5ae 100644
--- a/gquilt.spec
+++ b/gquilt.spec
@@ -1,13 +1,12 @@
 Name:		gquilt
-Version:	0.22
-Release:	3%{?dist}
+Version:	0.25
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Development/Tools
-Summary:	PyGTK GUI wrapper for quilt
+Summary:	PyGTK GUI wrapper for quilt and/or mq
 Source0:	http://sourceforge.net/projects/%{name}/files/%{name}/v-%{version}/%{name}-%{version}.tar.gz
 URL:		http://gquilt.sourceforge.net/
 BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils, pygtk2
 Requires:	pygtk2 >= 2.6, quilt
 
@@ -16,44 +15,44 @@ quilt is a tool for managing a series of patches by keeping track
 of the changes each patch makes. Patches can be applied, un-applied,
 refreshed, etc.
 
-gquilt is a PyGTK GUI wrapper for quilt. 
+Mercurial (hg) is a distributed source control tool and Mercurial Queues (mq)
+is a patch management tool extension to hg.
+
+gquilt is a PyGTK GUI wrapper for quilt and/or mq.
 
 %prep
-%setup
+%setup -q
+sed -i '/\/usr\/bin\/env/d' gquilt_pkg/gquilt.py
 
 %build
-make PREFIX=%{_prefix} all gquilt
+python setup.py build
+
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install
+python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+desktop-file-install gquilt.desktop --dir $RPM_BUILD_ROOT%{_datadir}/applications
 
-sed -i 's/Generic Name/GenericName/g' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.py
+chmod +x $RPM_BUILD_ROOT/%{_sysconfdir}/gquilt.d/qbsfe.sh
 
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/icons/
-%{_datadir}/%{name}/qbsfe.sh
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.pyc
-%{_datadir}/%{name}/*.pyo
+%dir %{_sysconfdir}/gquilt.d
+%{_sysconfdir}/gquilt.d/qbsfe.sh
+%{python_sitelib}/%{name}-%{version}-py?.?.egg-info/
+%dir %{python_sitelib}/gquilt_pkg
+%{python_sitelib}/gquilt_pkg/*.py*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%doc ChangeLog COPYING
+%doc COPYING copyright
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Mar 30 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 0.25-1
+- New upstream release
+- Update spec to match current guidelines
+- Fix relevant rpmlint errors and warnings 
 
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.22-2
 - recompiling .py files against Python 2.7 (rhbz#623312)
@@ -110,7 +109,7 @@ rm -rf "$RPM_BUILD_ROOT"
 - Include .pyo files on FC4 and earlier.
 - Patch to compile python files so that they include the proper path to the
   installed files.
-- Patch to install the gquilt hierarchy to %{_datadir} as everything's arch
+- Patch to install the gquilt hierarchy to datadir as everything's arch
   independent.
   
 * Tue Aug 23 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.12-2
diff --git a/sources b/sources
index 334a43c..637f12f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a15ad1c38cd26feba6a6b025fc91b213  gquilt-0.22.tar.gz
+090083f0dd137af19f22acaa13a312ef  gquilt-0.25.tar.gz