[svn] r9808 - in /trunk/rpms/filezilla: ./ filezilla.spec

Steve Huff shuff at vecna.org
Wed Apr 6 15:32:44 CEST 2011


Author: shuff
Date: Wed Apr  6 14:32:44 2011
New Revision: 9808

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9808&view=rev
Log:
updated to filezilla-3.4.0
added conditional to use system gnutls under el6

Modified:
    trunk/rpms/filezilla/   (props changed)
    trunk/rpms/filezilla/filezilla.spec

Propchange: trunk/rpms/filezilla/
------------------------------------------------------------------------------
    bzr:see-revprops = 9808

Modified: trunk/rpms/filezilla/filezilla.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/filezilla/filezilla.spec?rev=9808&r1=9807&r2=9808&view=diff
==============================================================================
--- trunk/rpms/filezilla/filezilla.spec (original)
+++ trunk/rpms/filezilla/filezilla.spec Wed Apr  6 14:32:44 2011
@@ -1,19 +1,23 @@
 # $Id$
 # Authority: shuff
 # Upstream: Tim Kosse <tim.kosse$filezilla-project,org>
+
+%{?el3:%define _with_bundled_gnutls 1}
+%{?el4:%define _with_bundled_gnutls 1}
+%{?el5:%define _with_bundled_gnutls 1}
 
 %define gnutls_version 2.8.5
 
 Summary: GUI SFTP/FTP client
 Name: filezilla
-Version: 3.3.4.1
+Version: 3.4.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://filezilla-project.org/
 
 Source0: http://prdownloads.sourceforge.net/project/filezilla/FileZilla_Client/%{version}/FileZilla_%{version}_src.tar.bz2
-Source1: http://ftp.gnu.org/pub/gnu/gnutls/gnutls-%{gnutls_version}.tar.bz2
+%{?_with_bundled_gnutls:Source1: http://ftp.gnu.org/pub/gnu/gnutls/gnutls-%{gnutls_version}.tar.bz2}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: dbus-devel
@@ -25,10 +29,14 @@
 BuildRequires: wxGTK-devel
 BuildRequires: xdg-utils
 
+%if 0%{?_with_bundled_gnutls}
 ### For gnutls
 BuildRequires: libgpg-error-devel
 BuildRequires: libgcrypt-devel
 BuildRequires: zlib-devel
+%else
+BuildRequires: gnutls-devel >= %{gnutls_version}
+%endif
 
 Requires: filesystem
 Requires: gnome-icon-theme
@@ -40,9 +48,10 @@
 
 %prep
 %setup
-%setup -T -D -a 1
+%{?_with_bundled_gnutls:%setup -T -D -a 1}
 
 %build
+%if 0%{?_with_bundled_gnutls}
 #### First, make a local gnutls
 pushd gnutls-%{gnutls_version}
 RESULT_DIR=`pwd`/result
@@ -61,9 +70,13 @@
 %{__make} %{?_smp_mflags} CFLAGS="%{optflags}" install
 popd
 
+export PKG_CONFIG_PATH="$RESULT_DIR/usr/%{_lib}/pkgconfig:$PKG_CONFIG_PATH"
+%endif
+
 ### Now, make filezilla
-export PKG_CONFIG_PATH="$RESULT_DIR/usr/%{_lib}/pkgconfig:$PKG_CONFIG_PATH"
 %configure \
+    --enable-static=%{?_with_bundled_gnutls:yes}%{!?_with_bundled_gnutls:no} \
+    --enable-locales \
     --disable-dependency-tracking \
     --disable-manualupdatecheck \
     --with-tinyxml=builtin
@@ -87,6 +100,11 @@
 %{_datadir}/pixmaps/filezilla.png
 
 %changelog
+* Wed Apr 06 2011 Steve Huff <shuff at vecna.org> - 3.4.0-1
+- Updated to version 3.4.0.
+- On el6, use the system gnutls.
+- Generate locale files.
+
 * Fri Oct 29 2010 Steve Huff <shuff at vecna.org> - 3.3.4.1-1
 - Updated to version 3.3.4.1.
 - Captured missing wxGTK dependency.




More information about the commits mailing list