rpms/filezilla/F-8 sources, 1.6, 1.7 filezilla.spec, 1.6, 1.7 FileZilla_3.0.11-rc1-system.patch, 1.1, NONE

[Chauvet Nicolas (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4730

Modified Files:
	sources filezilla.spec 
Removed Files:
	FileZilla_3.0.11-rc1-system.patch 
Log Message:
- Update to 3.1.0.1 - Security update



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Jul 2008 10:08:46 -0000	1.6
+++ sources	29 Jul 2008 10:14:27 -0000	1.7
@@ -1 +1 @@
-a0b7af162648ade8f593604913b6eedd  FileZilla_3.0.11.1_src.tar.bz2
+45a28bac466bd8f2eb1a97dfeb3ea8b3  FileZilla_3.1.0.1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-8/filezilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- filezilla.spec	8 Jul 2008 10:08:46 -0000	1.6
+++ filezilla.spec	29 Jul 2008 10:14:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.0.11.1
+Version:        3.1.0.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -7,7 +7,6 @@
 License:        GPLv2+
 URL:            http://filezilla-project.org/
 Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
-Patch0:         FileZilla_3.0.11-rc1-system.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Needed if autogen.sh is invoked
@@ -40,7 +39,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .system
 
 # Downgrade gnutls requirement
 sed -i -e 's/2.0.4/1.6.3/' configure.in
@@ -54,6 +52,7 @@
   --disable-static \
   --enable-locales \
   --disable-manualupdatecheck \
+  --with-tinyxml=system \
   --disable-autoupdatecheck 
 
 ## Do not use --enable-buildtype=official 
@@ -67,13 +66,9 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 
-mkdir -p __doc
-install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs
-
 for i in 16x16 32x32 48x48 ; do
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps
   ln -sf ../../../../%{name}/resources/${i}/%{name}.png \
@@ -113,7 +108,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
-%doc __doc/*
+%doc %{_datadir}/%{name}/docs/*
 %{_bindir}/*
 %{_datadir}/filezilla/
 %{_datadir}/applications/*%{name}.desktop
@@ -123,6 +118,12 @@
 
 
 %changelog
+* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1
+- Update to 3.1.0.1 - Security update
+
+* Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2
+- Update to 3.1.0-beta2
+
 * Tue Jul  8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1
 - Update to 3.0.11.1
 


--- FileZilla_3.0.11-rc1-system.patch DELETED ---