[libfm] 1.1.3

[Mamoru TASAKA]

commit 479f1c98322a6ddc13646e30e00c40ec3ef49672
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Tue Dec 3 13:21:05 2013 +0900

    1.1.3
    
    - Rebuild for new menu-cache 0.5.x

 .gitignore                    |    1 +
 libfm-1.1.2.2-bz3614948.patch |   12 ------------
 libfm.spec                    |   23 ++++++++++-------------
 sources                       |    2 +-
 4 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02091d6..ac9c9a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ libfm-0.1.12.tar.gz
 /libfm-1.1.2.tar.gz
 /libfm-1.1.2.1.tar.gz
 /libfm-1.1.2.2.tar.gz
+/libfm-1.1.3.tar.xz
diff --git a/libfm.spec b/libfm.spec
index 36ba8ae..102cae7 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -4,7 +4,7 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
 %global         usegit      0
-%global         mainrel     3
+%global         mainrel     1
 
 %global         githash     e2f4578bd5e89c7a12eae19abd8df7f9f599d115
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
@@ -20,7 +20,7 @@
 %global         build_doc   1
 
 Name:           libfm
-Version:        1.1.2.2
+Version:        1.1.3
 Release:        %{fedorarel}%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
@@ -30,17 +30,12 @@ URL:            http://pcmanfm.sourceforge.net/
 %if 0%{?usegit} >= 1
 Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
 %else
-Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.xz
 %endif
 # From git head e2f4578bd5e89c7a1 data/libfm-pref-apps.desktop.in
 Source1:        libfm-pref-apps.desktop.in
 # Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.patch
-# Workaround for sf bug 3614948 and 3614947
-# Clicking separator between Name and Description collapses Name
-# column completely and makes libfm abort.
-# ref: GNOME bugzilla 668779 and 698874
-Patch10:         libfm-1.1.2.2-bz3614948.patch	
 
 BuildRequires:  libexif-devel
 BuildRequires:  gtk3-devel
@@ -80,7 +75,7 @@ This package contains the generic non-gui functions of libfm.
 %package        gtk
 Summary:        File manager-related GTK+ widgets of %{name}
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gvfs
 
 %description    gtk
@@ -96,7 +91,7 @@ This package provides useful file manager-related GTK+ widgets.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -106,8 +101,8 @@ developing applications that use %{name}.
 %package        gtk-devel
 Summary:        Development files for %{name}-gtk
 Group:          Development/Libraries
-Requires:       %{name}-gtk = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-gtk%{?_isa} = %{version}-%{release}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description    gtk-devel
 The %{name}-devel package contains libraries and header files for
@@ -124,7 +119,6 @@ This package containg development documentation files for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .orig
-%patch10 -p1 -b .bz3614948
 
 install -cpm 644 %{SOURCE1} data/
 
@@ -253,6 +247,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Tue Dec  3 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.1.3-1
+- 1.1.3
+ 
 * Mon Nov 11 2013 Christoph Wickert <wickert at kolabsys.com> - 1.1.2.2-3
 - Rebuild for new menu-cache 0.5.x
 
diff --git a/sources b/sources
index ba852dd..d78df7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea3d09b23ef4c37cb84ae57ea16b8f08  libfm-1.1.2.2.tar.gz
+50fff66019d885353462808df94899e7  libfm-1.1.3.tar.xz