diff --git a/README.identica b/README.identica deleted file mode 100644 index 4b68985..0000000 --- a/README.identica +++ /dev/null @@ -1,13 +0,0 @@ -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-034-revert_json_change.patch b/bti-034-revert_json_change.patch new file mode 100644 index 0000000..fff4977 --- /dev/null +++ b/bti-034-revert_json_change.patch @@ -0,0 +1,26 @@ +diff --git a/bti.c b/bti.c +index 203dff1..f8cc151 100644 +--- a/bti.c ++++ b/bti.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/configure.ac b/configure.ac +index 2f15a07..4923480 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ PKG_CHECK_MODULES(LIBOAUTH, oauth) + PKG_CHECK_MODULES(LIBPCRE, libpcre) + PKG_CHECK_MODULES([LIBCURL], [libcurl]) + PKG_CHECK_MODULES([XML], [libxml-2.0]) +-PKG_CHECK_MODULES([JSON], [json-c]) ++PKG_CHECK_MODULES([JSON], [json]) + + AC_SEARCH_LIBS([dlopen], [dl]) + diff --git a/bti.spec b/bti.spec index 512f936..f2fac20 100644 --- a/bti.spec +++ b/bti.spec @@ -1,16 +1,18 @@ Name: bti Version: 034 -Release: 1%{?dist} -Summary: Bash Twitter/Identi.ca Idiocy +Release: 2%{?dist} +Summary: Bash Twitter Idiocy Group: Applications/Internet License: GPLv2 URL: https://github.com/gregkh/bti # kernel.org, not always up to date Source0: https://www.kernel.org/pub/software/web/bti/bti-%{version}.tar.xz +# build against the older JSON API available in EPEL6 +# new JSON blocked by #903009 +Patch0: bti-034-revert_json_change.patch # fallback, need to run autotools on these -#Source0: https://github.com/gregkh/bti/archive/%{version}.tar.gz -Source1: README.identica +#Source0: https://github.com/gregkh/bti/archive/%%{version}.tar.gz %if 0%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +24,9 @@ BuildRequires: curl-devel BuildRequires: libcurl-devel %endif # for building from github +%if 0%{?el6} BuildRequires: autoconf automake +%endif # Not using pkgconfig(...) deps yet since we're still supporting EL5 BuildRequires: pkgconfig BuildRequires: liboauth-devel @@ -31,18 +35,23 @@ BuildRequires: libxml2-devel BuildRequires: json-c-devel %description -Allows you to pipe your bash input to twitter or identi.ca in an easy +Allows you to pipe your bash input to twitter in an easy and fast manner to annoy the whole world. %prep %setup -q +%if 0%{?el6} +%patch0 -p1 -b .revert_json_change +%endif cp -p %{SOURCE1} . %build # for building from github -#autoreconf --install --symlink +%if 0%{?el6} +autoreconf --install --symlink +%endif %configure make %{?_smp_mflags} LDFLAGS="-L%{_libdir}/readline5" @@ -65,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc ChangeLog COPYING README README.identica RELEASE-NOTES +%doc ChangeLog COPYING README RELEASE-NOTES %doc bti.example # Own the directory so that we do not need to Require: # bash-completion just for one file @@ -78,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 11 2014 Michel Salim - 034-2 +- Build against older JSON API on EPEL6 (bug #903009) +- Remove references to identi.ca, no longer supported + * Wed Jan 29 2014 Michel Salim - 034-1 - Update to 034