kwizart pushed to filezilla (f21). "Merge branch 'master' into f21"

[notifications at fedoraproject.org]

>From fb720bf3a2e3ebaba6783ccdf27a8bb72d7962f0 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Thu, 12 Mar 2015 22:47:00 +0100
Subject: Update sources


diff --git a/.gitignore b/.gitignore
index 8a10915..3fefefe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ FileZilla_3.3.4_src.tar.bz2
 /FileZilla_3.10.0_src.tar.bz2
 /FileZilla_3.10.0.2_src.tar.bz2
 /FileZilla_3.10.2-rc2_src.tar.bz2
+/FileZilla_3.10.2_src.tar.bz2
diff --git a/sources b/sources
index df1a3ea..80b17f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0d72e06b7b8b976b95412e504fb9f44  FileZilla_3.10.2-rc2_src.tar.bz2
+b2eb584efd76e61de2cb62fbe11f3a14  FileZilla_3.10.2_src.tar.bz2
-- 
cgit v0.10.2


>From bea9f4da3d5b0b1ffefb7c5982631dbf4e5f5250 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Tue, 17 Mar 2015 16:45:48 +0100
Subject: Update to 3.10.3-beta2


diff --git a/filezilla.spec b/filezilla.spec
index 2b7a71e..ad92c18 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -1,8 +1,8 @@
-#global fz_rc   rc2
+%global fz_rc   beta2
 
 Name:           filezilla
-Version:        3.10.2
-Release:        1%{?dist}
+Version:        3.10.3
+Release:        0.2%{?dist}
 Summary:        FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -140,6 +140,9 @@ fi || :
 
 
 %changelog
+* Tue Mar 17 2015 Nicolas Chauvet <kwizart at gmail.com> - 3.10.3-0.2
+- Update to 3.10.3-beta2
+
 * Thu Mar 12 2015 Nicolas Chauvet <kwizart at gmail.com> - 3.10.2-1
 - Update to 3.10.2
 
diff --git a/sources b/sources
index 80b17f0..7c44762 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2eb584efd76e61de2cb62fbe11f3a14  FileZilla_3.10.2_src.tar.bz2
+ffd602398b6af46539462543ca2e77f1  FileZilla_3.10.3-beta2_src.tar.bz2
-- 
cgit v0.10.2


>From 3fbc66025bba63150a1232034279f68a48b57d7d Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Tue, 17 Mar 2015 16:59:24 +0100
Subject: Add .gitignore


diff --git a/.gitignore b/.gitignore
index 3fefefe..37517ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ FileZilla_3.3.4_src.tar.bz2
 /FileZilla_3.10.0.2_src.tar.bz2
 /FileZilla_3.10.2-rc2_src.tar.bz2
 /FileZilla_3.10.2_src.tar.bz2
+/FileZilla_3.10.3-beta2_src.tar.bz2
-- 
cgit v0.10.2


>From 4639992d625542eb51613e1ebd9d7a5a4eec20e5 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Mon, 30 Mar 2015 17:41:49 +0100
Subject: Update the screenshot shown in the software center


diff --git a/filezilla.spec b/filezilla.spec
index ad92c18..c71c7aa 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -2,7 +2,7 @@
 
 Name:           filezilla
 Version:        3.10.3
-Release:        0.2%{?dist}
+Release:        0.3%{?dist}
 Summary:        FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ BuildRequires:  sqlite-devel
 #BuildRequires:  tinyxml-devel >= 2.5.3
 Provides: bundled(tinyxml) = 2.6.2
 BuildRequires:  wxGTK3-devel >= 3.0.1
+BuildRequires:  libappstream-glib
 
 
 %description
@@ -79,6 +80,15 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 
+# Update the screenshot shown in the software center
+#
+# NOTE: It would be *awesome* if this file was pushed upstream.
+#
+# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
+#
+appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/filezilla.appdata.xml \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/filezilla/a.png 
+
 for i in 16x16 32x32 48x48 ; do
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps
   ln -sf ../../../../%{name}/resources/${i}/%{name}.png \
@@ -140,6 +150,9 @@ fi || :
 
 
 %changelog
+* Mon Mar 30 2015 Richard Hughes <rhughes at redhat.com> - 3.10.3-0.3
+- Use better AppData screenshots
+
 * Tue Mar 17 2015 Nicolas Chauvet <kwizart at gmail.com> - 3.10.3-0.2
 - Update to 3.10.3-beta2
 
-- 
cgit v0.10.2


>From 01a0072257bd1e2b3bae8c9b1f9c7cd040ac29b0 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Fri, 3 Apr 2015 20:31:00 +0200
Subject: Update to 3.10.3


diff --git a/.gitignore b/.gitignore
index 37517ed..f4c0814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ FileZilla_3.3.4_src.tar.bz2
 /FileZilla_3.10.2-rc2_src.tar.bz2
 /FileZilla_3.10.2_src.tar.bz2
 /FileZilla_3.10.3-beta2_src.tar.bz2
+/FileZilla_3.10.3_src.tar.bz2
diff --git a/filezilla.spec b/filezilla.spec
index c71c7aa..aac12ea 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -1,8 +1,8 @@
-%global fz_rc   beta2
+#global fz_rc   beta2
 
 Name:           filezilla
 Version:        3.10.3
-Release:        0.3%{?dist}
+Release:        1%{?dist}
 Summary:        FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@ fi || :
 
 
 %changelog
+* Thu Apr 02 2015 Nicolas Chauvet <kwizart at gmail.com> - 3.10.3-1
+- Update to 3.10.3
+
 * Mon Mar 30 2015 Richard Hughes <rhughes at redhat.com> - 3.10.3-0.3
 - Use better AppData screenshots
 
diff --git a/sources b/sources
index 7c44762..5f8e007 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffd602398b6af46539462543ca2e77f1  FileZilla_3.10.3-beta2_src.tar.bz2
+0c7511a964cbd2afa95e0c42c7258dee  FileZilla_3.10.3_src.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/filezilla.git/commit/?h=f21&id=1b8b16f14341b22dd9339d4add9a5928de37c7f5