[filezilla] filezilla moved to wxGTK3 by default

Nicolas Chauvet kwizart at fedoraproject.org
Thu Oct 16 21:43:14 UTC 2014


commit bf84b179ba30cd9c7efe8d6cc93dc8ca327ba546
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Oct 16 23:43:06 2014 +0200

    filezilla moved to wxGTK3 by default

 filezilla.spec |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/filezilla.spec b/filezilla.spec
index adcd942..b02427c 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -1,7 +1,4 @@
 #global fz_rc   rc2
-%if 0%{?fedora} >= 21
-%global _with_wxgtk3 1
-%endif
 
 Name:           filezilla
 Version:        3.9.0.5
@@ -32,11 +29,7 @@ BuildRequires:  sqlite-devel
 #http://sourceforge.net/p/tinyxml/patches/51/
 #BuildRequires:  tinyxml-devel >= 2.5.3
 Provides: bundled(tinyxml) = 2.6.2
-%if 0%{?_with_wxgtk3}
 BuildRequires:  wxGTK3-devel >= 3.0.1
-%else
-BuildRequires:  wxGTK-devel
-%endif
 
 
 %description
@@ -60,14 +53,14 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
 
 
 %build
+# for wxGTK3 - needed to find wxrc
+PATH=$PATH:%{_libexecdir}/wxGTK3/
 %configure \
   --disable-static \
   --enable-locales \
   --disable-manualupdatecheck \
   --with-tinyxml=builtin \
-%if 0%{?_with_wxgtk3}
-  --with-wxdir=%{_libexecdir}/wxGTK3 \
-%endif
+  --with-wx-config=wx-config-3.0 \
   --disable-autoupdatecheck 
 
 ## Do not use --enable-buildtype=official 


More information about the scm-commits mailing list