rpms/filezilla/devel sources, 1.15, 1.16 .cvsignore, 1.12, 1.13 filezilla.spec, 1.16, 1.17 FileZilla_3.1.0-socket.patch, 1.1, NONE FileZilla_3.0.11-rc1-system.patch, 1.1, NONE

[Chauvet Nicolas (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25566

Modified Files:
	sources .cvsignore filezilla.spec 
Removed Files:
	FileZilla_3.1.0-socket.patch FileZilla_3.0.11-rc1-system.patch 
Log Message:
-Update to 3.1.0.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Jul 2008 16:10:41 -0000	1.15
+++ sources	25 Jul 2008 11:49:06 -0000	1.16
@@ -1 +1 @@
-0be04004b138a80f7a4d94bfd82cb69d  FileZilla_3.1.0-beta2_src.tar.bz2
+45a28bac466bd8f2eb1a97dfeb3ea8b3  FileZilla_3.1.0.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Jul 2008 16:10:41 -0000	1.12
+++ .cvsignore	25 Jul 2008 11:49:06 -0000	1.13
@@ -1 +1 @@
-FileZilla_3.1.0-beta2_src.tar.bz2
+FileZilla_3.1.0.1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- filezilla.spec	14 Jul 2008 16:10:41 -0000	1.16
+++ filezilla.spec	25 Jul 2008 11:49:06 -0000	1.17
@@ -1,18 +1,16 @@
 Name:           filezilla
-Version:        3.1.0
-Release:        0.1.beta2%{?dist}
+Version:        3.1.0.1
+Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://filezilla-project.org/
-Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}-beta2_src.tar.bz2
-Patch0:         FileZilla_3.0.11-rc1-system.patch
-Patch1:         FileZilla_3.1.0-socket.patch
+Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Needed if autogen.sh is invoked
-BuildRequires:  automake, autoconf, libtool
+#BuildRequires:  automake, autoconf, libtool
 ## 
 ## Needed if test program is build
 BuildRequires:  cppunit-devel >= 1.10.2
@@ -40,14 +38,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
-%patch0 -p1 -b .system
-%patch1 -p1 -b .socket
+%setup -q -n %{name}-%{version}
 
 #sed -i -e 's/2.0.4/1.6.3/' configure.in
 
 # Run autotools if needed
-sh autogen.sh
+# sh autogen.sh
 
 
 %build
@@ -55,6 +51,7 @@
   --disable-static \
   --enable-locales \
   --disable-manualupdatecheck \
+  --with-tinyxml=system \
   --disable-autoupdatecheck 
 
 ## Do not use --enable-buildtype=official 
@@ -68,13 +65,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 \
@@ -114,7 +107,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
@@ -124,15 +117,15 @@
 
 
 %changelog
+* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1
+- Update to 3.1.0.1
+
 * 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
 
-* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 3.0.11-2
-- rebuild with new gnutls
-
 * Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1
 - Update to 3.0.11
 - Create patch for a shared tinyxml.


--- FileZilla_3.1.0-socket.patch DELETED ---


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