[metromap] * Thu Nov 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.3-1 - Updated spec file to reflect

[Fabian Affolter]

commit e1d7269fc923a3514c21d8705974c8522ff8d277
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Nov 17 18:52:55 2011 +0100

    * Thu Nov 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.3-1
    - Updated spec file to reflect upstream changes
    - Updated to new upstream version 0.1.3

 .gitignore    |    1 +
 metromap.spec |   49 ++++++++++++++++++++++++++++++++++++-------------
 sources       |    2 +-
 3 files changed, 38 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 483ccba..650699a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 metromap-0.1.2.tar.bz2
+/metromap-0.1.3.tar.bz2
diff --git a/metromap.spec b/metromap.spec
index 8040dc5..71e622e 100644
--- a/metromap.spec
+++ b/metromap.spec
@@ -1,14 +1,12 @@
 Name:           metromap
-Version:        0.1.2
-Release:        7%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 Summary:        Simple program for finding paths in subway/metro maps
 
 Group:          Applications/Internet
 License:        GPL+
 URL:            http://metromap.antex.ru/
-Source0:        http://downloads.sourceforge.net/metro-map/%{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Source2:        %{name}.png
+Source0:        http://metromap.antex.ru/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -17,6 +15,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 
 Requires:       pygtk2
+Requires:       hicolor-icon-theme
 
 
 %description
@@ -28,7 +27,12 @@ are included. Others can be downloaded.
 %prep
 %setup -q
 sed -i -e '/^#!\//, 1d' modules/{FindPath.py,MapDisplay.py,Interface.py,ReadMap.py}
-
+# Convert to utf-8
+for file in metromap.desktop; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
 
 %build
 make %{?_smp_mflags}
@@ -37,8 +41,12 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}%{_prefix} INSTALL="install -p"
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install                                    \
+    --delete-original                                   \
+    --remove-category="Gtk;Office;"                     \
+    --remove-category="GTK;"                            \
+    --dir=%{buildroot}%{_datadir}/applications          \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
@@ -46,17 +54,32 @@ install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 rm -rf %{buildroot}
 
 
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/AUTHORS doc/COPYING doc/NEWS doc/READ* doc/TODO
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*x*/apps/
 
 
 %changelog
-* Fri Aug 12 2011 Fabian Affolter <fabian at bernewireless.net> - 0.1.2-7
+* Thu Nov 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.3-1
+- Updated spec file to reflect upstream changes
+- Updated to new upstream version 0.1.3
+
+* Fri Aug 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.2-7
 - Rebuild (pygtk2)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-6
@@ -68,13 +91,13 @@ rm -rf %{buildroot}
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat Mar 07 2009 Fabian Affolter <fabian at bernewireless.net> - 0.1.2-3
+* Sat Mar 07 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.2-3
 - Added russian translation to .desktop file
 
-* Sat Mar 07 2009 Fabian Affolter <fabian at bernewireless.net> - 0.1.2-2
+* Sat Mar 07 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.2-2
 - Fixed Source URL
 - Fixed License
 
-* Sat Jan 30 2009 Fabian Affolter <fabian at bernewireless.net> - 0.1.2-1
+* Sat Jan 30 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.2-1
 - Initial package for Fedora
 
diff --git a/sources b/sources
index 40e69e1..a7561ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3a92b70f7a282ad7b0ff52bec645ab2  metromap-0.1.2.tar.bz2
+23aeab972224456a0a54675abab0a4ad  metromap-0.1.3.tar.bz2