diff --git a/.gitignore b/.gitignore index 2d00fdb..88a2ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/bti-031.tar.bz2 +/gregkh-bti-032-0-gfabeb14.tar.gz diff --git a/README.Fedora b/README.Fedora deleted file mode 100644 index cf9c743..0000000 --- a/README.Fedora +++ /dev/null @@ -1,5 +0,0 @@ -Twitter now requires OAuth authentication. See README for how to set it up, -and get the required keys from bti's source tree here: - - https://github.com/gregkh/bti/blob/master/oath.keys - diff --git a/README.identica b/README.identica new file mode 100644 index 0000000..4b68985 --- /dev/null +++ b/README.identica @@ -0,0 +1,13 @@ +To authenticate with Identi.ca using OAuth, use the following consumer +key and consumer secret, instead of the ones noted in README (those +are Twitter-specific): + +consumer_key=91af24b17983090ad7465f9d5ce5aa17 +consumer_secret=cbbafce3066dca49ffbd3e8b006e5b7f + +You'd also need to have the following line: + +host=identica + +else bti assumes you're using Twitter + diff --git a/bti.spec b/bti.spec index ea4e4cb..eb9f74f 100644 --- a/bti.spec +++ b/bti.spec @@ -1,20 +1,28 @@ +%global upstream gregkh +%global commit_hash fabeb14 + Name: bti -Version: 031 -Release: 3%{?dist} +Version: 032 +Release: 1%{?dist} Summary: Bash Twitter/Identi.ca Idiocy Group: Applications/Internet License: GPLv2 -URL: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti -Source0: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2 -Source1: README.Fedora +URL: https://github.com/gregkh/bti +# wget --content-disposition %%{url}/tarball/%%{version} +Source0: %{upstream}-%{name}-%{version}-0-g%{commit_hash}.tar.gz +Source1: README.identica + +%if 0%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif %if 0%{?el5} BuildRequires: curl-devel %else BuildRequires: libcurl-devel %endif +BuildRequires: autoconf automake BuildRequires: liboauth-devel libxml2-devel pcre-devel #Requires: @@ -24,11 +32,12 @@ and fast manner to annoy the whole world. %prep -%setup -q +%setup -q -n %{upstream}-%{name}-758e50d cp -p %{SOURCE1} . %build +autoreconf --install --symlink %configure make %{?_smp_mflags} LDFLAGS="-L%{_libdir}/readline5" @@ -47,7 +56,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc bti.example ChangeLog COPYING README README.Fedora RELEASE-NOTES +%doc ChangeLog COPYING README README.identica RELEASE-NOTES +%doc bti.example oath.keys # Own the directory so that we do not need to Require: # bash-completion just for one file %dir %{_sysconfdir}/bash_completion.d @@ -59,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 19 2012 Michel Salim - 032-1 +- Update to 032 + * Fri Feb 10 2012 Petr Pisar - 031-3 - Rebuild against PCRE 8.30 diff --git a/sources b/sources index 34c8ae5..e004dab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -030b2a74f976d89c1d9acbde5d72573f bti-031.tar.bz2 +1e0d0b693fdeebec268004ba41701baf gregkh-bti-032-0-gfabeb14.tar.gz