[mailnag] update to 0.4.3

[Thorsten Leemhuis]

commit 72573ee74719af8f646bd114eda5abbccc4d4ba5
Author: Thorsten Leemhuis <fedora at leemhuis.info>
Date:   Thu Oct 11 20:24:32 2012 +0200

    update to 0.4.3
    
    - use the newly added setup.py for install, which simplifies the spec file
      a lot

 .gitignore   |    1 +
 mailnag.spec |   51 ++++++++++++++-------------------------------------
 sources      |    2 +-
 3 files changed, 16 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e5978b..a90e3b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mailnag-0.4.2.tar.gz
+/mailnag-0.4.3.tar.gz
diff --git a/mailnag.spec b/mailnag.spec
index 77b127f..26472e3 100644
--- a/mailnag.spec
+++ b/mailnag.spec
@@ -1,11 +1,11 @@
 Name:           mailnag
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.4.3
+Release:        1%{?dist}
 Summary:        Mail notification daemon for GNOME 3
 
 License:        GPLv2
 URL:            https://github.com/pulb/mailnag
-Source0:        https://github.com/downloads/pulb/mailnag/mailnag-0.4.2.tar.gz
+Source0:        https://github.com/downloads/pulb/%{name}/%{name}-%{version}.tar.gz
 # submitted during review; will send it upstream soon
 Patch0:         mailnag-imaplib2.patch
 
@@ -19,6 +19,7 @@ Requires:       notify-python
 Requires:       pyxdg
 
 BuildArch:      noarch
+BuildRequires:  python2-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
@@ -31,49 +32,19 @@ creates a proper GNOME 3 notification that mentions sender and subject.
 %setup -q -c %{name}-%{version}
 %patch0 -b .patch0
 
-# adjust for final locations
-sed -i 's!./Mailnag!'%{_datadir}/%{name}'/Mailnag!g' mailnag mailnag_config
-sed -i 's!./data!'%{_datadir}/%{name}'/!g' Mailnag/common/utils.py
-sed -i 's!./locale!'%{_datadir}'/locale!g' Mailnag/common/i18n.py
-sed -i 's!Exec=/usr/share/mailnag/mailnag_config!Exec='%{_bindir}'/mailnag_config!g' data/mailnag_config.desktop
-sed -i 's!Icon=/usr/share/mailnag/mailnag.svg!Icon='%{_datadir}'/icons/hicolor/scalable/apps/mailnag.svg!g' data/mailnag_config.desktop
-sed -i 's!mailnag.svg!'%{_datadir}'/icons/hicolor/scalable/apps/mailnag.svg!g' Mailnag/configuration/configwindow.py
-
 # avoid rpmlint error wrong-script-end-of-line-encoding for these files
 sed -i -e 's/\r//' Mailnag/{config,mailnag,configuration/accountdialog}.py
 
 # sooner or later python3 might be the default in Fedora; be prepared
 sed -i 's_#!.*/usr/bin/env.*python_#!%{_bindir}/env python2_' $(find . -name '*.py')
 
-# we want these two files somewhere else later, so move them away
-mkdir .tmp
-mv data/{mailnag_config.desktop,mailnag.svg} .tmp
-
-
 %build
-./gen_locales
-
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-
-# note to self: sit down on a rainy day and write a proper makefile to submit it upstream
-install -m 755 -d %{buildroot}%{_bindir}
-install -m 755 -d %{buildroot}%{_datadir}/%{name}
-install -m 755 -d %{buildroot}%{_datadir}/applications
-install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-
-install -m 755 -t %{buildroot}%{_bindir} mailnag mailnag_config
-install -m 644 -t %{buildroot}%{_datadir}/icons/hicolor/scalable/apps .tmp/mailnag.svg
-cp -r locale %{buildroot}%{_datadir}
-cp -r Mailnag %{buildroot}%{_datadir}/%{name}
-cp -r data/* %{buildroot}%{_datadir}/%{name}
-
-install -m 644 -t %{buildroot}%{_datadir}/applications .tmp/mailnag_config.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/mailnag_config.desktop
-
-find %{buildroot}%{_datadir}/ -type f -exec chmod 644 {} \;
-find %{buildroot}%{_datadir}/%{name} -type f -name "*.py" -exec chmod 755 {} \;
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mailnag_config.desktop
 
 %find_lang %{name}
 
@@ -95,11 +66,17 @@ fi
 %doc AUTHORS LICENSE NEWS README.md 
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
-%{_datadir}/icons/*
+%{python_sitelib}/Mailnag
+%{python_sitelib}/%{name}-0.4.3-py2.7.egg-info
 %{_datadir}/applications/*
 
 
 %changelog
+* Sun Oct 07 2012 Thorsten Leemhuis <fedora at leemhuis.info> - 0.4.3-1
+- update to 0.4.3
+- use the newly added setup.py for install, which simplifies the spec file 
+  a lot
+
 * Mon Aug 13 2012 Thorsten Leemhuis <fedora at leemhuis.info> - 0.4.2-2
 - apply patch that fixes a issue found during review #847512
 
diff --git a/sources b/sources
index dc08b29..816a95a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-998666618dd0a4e23d3d11752262efac  mailnag-0.4.2.tar.gz
+0abb82bb6d65103d7129e9dfc495010d  mailnag-0.4.3.tar.gz