[phatch] - Unversioned docdir change (#994032) - Spec cleaning - Fixing bogus dates in the changelog

[Jaromír Cápík]

commit 24c394a5468ffb211e3ad9a65215806817b78207
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Sep 4 19:08:11 2013 +0200

    - Unversioned docdir change (#994032)
    - Spec cleaning
    - Fixing bogus dates in the changelog

 phatch.spec |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/phatch.spec b/phatch.spec
index eb2c531..0bd2711 100644
--- a/phatch.spec
+++ b/phatch.spec
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define debug_package %{nil}
+
 Name:           phatch
 Version:        0.2.7
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Photo batch processor
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://photobatch.stani.be/
 Source0:        http://photobatch.stani.be/download/package/%{name}-%{version}.1.tar.gz 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
@@ -27,7 +27,6 @@ Patch2 :        pyexiv2_compat.patch
 Patch3:         phatch-pillow.patch
 
 
-
 %description
 Phatch is a simple to use cross-platform GUI Photo Batch Processor
 which handles all popular image formats and can duplicate
@@ -38,6 +37,7 @@ Phatch allows you to use EXIF and IPTC tags for renaming
 and data stamping. Phatch also supports a console version
 to batch photos on web-servers.
 
+
 %package cli
 Summary: Command line interface for phatch
 Group: Applications/Multimedia
@@ -54,34 +54,39 @@ Requires:       /usr/bin/jpegtran
 Requires:       fbida
 Requires:       xcftools
 
+
 %package -n nautilus-%{name}
 Summary: Nautilus extension for %{name}
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: nautilus-python
 
+
 %description cli
 Command line interface for phatch 
 
+
 %description -n nautilus-%{name}
 Nautilus extension for %{name}
 
+
 %prep
 %setup -q 
 rm -f docs/build/html/.buildinfo
 # let %%doc manage documentation
 sed -i -e 's/\+ doc_files//' setup.py
 # Change search path for documentation
-sed -i -e "s at help_path =.*@help_path=\'%{_datadir}/doc/%{name}-%{version}\'@" %{name}/pyWx/gui.py
+sed -i -e "s at help_path =.*@help_path=\'%{_docdir}/%{name}\'@" %{name}/pyWx/gui.py
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
 
+
 %build
 %{__python} setup.py build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 desktop-file-install --vendor=""                                 \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications/   \
@@ -102,6 +107,7 @@ fi
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+
 %postun -n %{name}
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -111,13 +117,7 @@ update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
- 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING docs/build/html/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-inspector.desktop
@@ -129,8 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/pyWx
 %{python_sitelib}/%{name}/lib/pyWx
 
+
 %files cli -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{python_sitelib}/%{name}
 %{_bindir}/%{name}
@@ -140,12 +140,18 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/pyWx
 %exclude %{python_sitelib}/%{name}/lib/pyWx
 
+
 %files -n nautilus-%{name}
-%defattr(-,root,root,-)
 %doc COPYING
 %{python_sitelib}/%{name}/lib/linux/nautilusExtension.*
 
+
 %changelog
+* Wed Sep 04 2013 jcapik at redhat.com - 0.2.7-14
+- Unversioned docdir change (#994032)
+- Spec cleaning
+- Fixing bogus dates in the changelog
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.7-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -158,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Mar 24 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.2.7-10
 - Rebuild for xcftools 
 
-* Mon Mar 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.2.7-9
+* Thu Mar 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.2.7-9
 - Rebuild for xcftools
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.7-8
@@ -183,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Mar 13 2010 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.7-1
 - Update to 0.2.7
 - Package is now noarch
-* Thu Dec 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.5-1
+* Tue Dec 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.5-1
 - Update to 0.2.5
 - New cli subpackage to use the application with no gui requirements
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-5