[freetalk/f19: 3/5] Update to 4.0rc4

[Christopher Meng]

commit c8af8ad8669bb45fa0c944bb0748b21fc7112d75
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 3 23:16:14 2014 +0800

    Update to 4.0rc4

 .gitignore    |    1 +
 freetalk.spec |   80 +++++++++++++++++++++++---------------------------------
 sources       |    2 +-
 3 files changed, 35 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 979eede..75104ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 freetalk-3.2.tar.gz
+/freetalk-4.0rc4.tar.gz
diff --git a/freetalk.spec b/freetalk.spec
index 8a3040b..f71806c 100644
--- a/freetalk.spec
+++ b/freetalk.spec
@@ -1,24 +1,23 @@
-Summary:	A console based Jabber client
+%global pre     rc4
+
 Name:		freetalk
-Version:	3.2
-Release:	10%{?dist}
+Version:	4.0
+Release:	0.1.%{?pre}%{?dist}
+Summary:	A console based Jabber client
 License:	GPLv3+
-Group:		Applications/Internet
 URL:		http://www.gnu.org/software/freetalk/
-Source0:	http://sv.gnu.org/download/freetalk/%{name}-%{version}.tar.gz
-
-Patch0:		%{name}-%{version}-glibc210.patch
-
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Requires:	words
-Requires(post): info
-Requires(preun): info
-
-BuildRequires:	gettext
+Source0:	https://github.com/GNUFreetalk/freetalk/archive/v4.0%{?pre}.tar.gz#/%{name}-%{version}%{?pre}.tar.gz
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	glib2-devel
 BuildRequires:	guile-devel
+BuildRequires:	libcurl-devel
+BuildRequires:	jansson-devel
 BuildRequires:	loudmouth-devel
 BuildRequires:	readline-devel
+Requires:	words
+Requires(post): info
+Requires(preun): info
 
 %description
 GNU Freetalk is a console based Jabber client. It features a readline interface
@@ -26,58 +25,45 @@ with completion of buddy names, commands, and even ordinary English words.
 Freetalk is extensible, configurable, and scriptable through a Guile interface.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -qn %{name}-%{version}%{?pre}
 
 %build
-%configure --disable-rpath
-make %{?_smp_mflags}
+./autogen.sh
+%configure --disable-silent-rules --disable-rpath
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
-rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
+rm -rf %{buildroot}%{_infodir}/dir
 
 # Move examples from /usr/share/doc/freetalk to RPM_BUILD_DIR.
 # To be later listed against %doc.
 rm -rf ./examples
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/examples .
-
-%find_lang %{name}
+mv %{buildroot}%{_docdir}/%{name}/examples .
 
 # Files containing shebangs need to have the executable bits.
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/first-time-run.sh
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+chmod 755 %{buildroot}%{_datadir}/%{name}/extensions/first-time-run.sh
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info \
-  %{_infodir}/dir >/dev/null 2>&1 || :
+  install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir >/dev/null 2>&1 || :
 fi
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS
-%doc ChangeLog
-%doc COPYING
-%doc NEWS
-%doc README
-%doc examples
-%doc %{_infodir}/%{name}.info*
-%doc %{_mandir}/man1/%{name}.1*
+%files
+%doc AUTHORS.md COPYING NEWS README examples/
 %{_bindir}/%{name}
-
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/extensions
+%{_datadir}/%{name}/
+%{_infodir}/%{name}.info*
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Jul 02 2014 Christopher Meng <rpm at cicku.me> - 4.0-0.1.rc4
+- Update to 4.0rc4
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -115,6 +101,6 @@ fi
 * Thu Feb 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.0-2
 - Added 'Requires: words'.
 
-* Sun Nov 24 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.0-1
+* Sat Nov 24 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.0-1
 - Initial build.
 - Fixed sources to provide mode when using the O_CREAT flag in open(2).
diff --git a/sources b/sources
index c4983a0..159ee94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab09bd07dde158551f151d281b14642c  freetalk-3.2.tar.gz
+a975f5276f5f61b329301f13290d3e73  freetalk-4.0rc4.tar.gz