sagitter pushed to telegram-cli (f22). "Update to 1.3.1"

[notifications at fedoraproject.org]

From 208fc0a4aee15435c4087b4db49ebfa424846d0b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Fri, 15 May 2015 16:58:40 +0200
Subject: Update to 1.3.1


diff --git a/.gitignore b/.gitignore
index a1ca5c7..d673c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /tg-1.0.5.1.tar.gz
 /tg-717b01ff7f3c66954d1fd8b31b78fa20e13ac8fa.tar.gz
 /tg-d96750aba3e697ccfecd3b5995b9229b4f35ac1d.tar.gz
+/tg-5935c97ed05b90015418b5208b7beeca15a6043c.tar.gz
diff --git a/sources b/sources
index e879cda..62efed3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e95a08a79392cf4c162c91c9668758a0  tg-d96750aba3e697ccfecd3b5995b9229b4f35ac1d.tar.gz
+e146a4a1d2ccf5764850c414115d11e4  tg-5935c97ed05b90015418b5208b7beeca15a6043c.tar.gz
diff --git a/telegram-cli-compilerflags.patch b/telegram-cli-compilerflags.patch
deleted file mode 100644
index 35d9edd..0000000
--- a/telegram-cli-compilerflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	2014-03-06 23:43:15.000000000 +0100
-+++ configure	2014-03-07 18:59:47.795084987 +0100
-@@ -3424,8 +3424,8 @@
- 
- 
- # BSD locations for headers and libraries from packages, Linux locations for self-compiled stuff.
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+CPPFLAGS=$CPPFLAGS
-+LDFLAGS=$LDFLAGS
- 
- # Checks for libraries.
- 
-
diff --git a/telegram-cli.spec b/telegram-cli.spec
index 54b4384..9c5941b 100644
--- a/telegram-cli.spec
+++ b/telegram-cli.spec
@@ -1,26 +1,28 @@
-%global  checkout   d96750aba3e697ccfecd3b5995b9229b4f35ac1d
-%global  date       20150114
+%global  checkout   5935c97ed05b90015418b5208b7beeca15a6043c
+%global  date       20150515
+
+## The RPM macro for the linker flags does not exist on EPEL
+%if 0%{?epel} < 7
+%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
+%endif
 
 Name:    telegram-cli
-Version: 1.2.0
+Version: 1.3.1
 Release: 1.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
 Summary: Linux Command-line interface for Telegram
 License: GPLv2+ and LGPLv2+
 URL:     https://github.com/vysheng/tg
 ## Source archive made by using following commands
 ## git clone --recursive https://github.com/vysheng/tg
-## tar -cvzf tg-d96750aba3e697ccfecd3b5995b9229b4f35ac1d.tar.gz tg
+## tar -cvzf tg-5935c97ed05b90015418b5208b7beeca15a6043c.tar.gz tg
 Source0: tg-%{checkout}.tar.gz
 
-##Remove local include and libraries locations
-Patch0:  %{name}-compilerflags.patch
-
 ## See bz#1138804
 ## Upstream issue on https://github.com/vysheng/tg/issues/239
-ExcludeArch: ppc ppc64
+ExcludeArch: ppc64 s390 s390x
 
 BuildRequires: lua-devel, openssl-devel, libevent-devel
-BuildRequires: libconfig-devel, readline-devel
+BuildRequires: libconfig-devel, readline-devel, jansson-devel
 
 %description
 Telegram is an Open Source instant messaging platform for mobile and
@@ -29,7 +31,6 @@ This is a Linux Command-line interface for Telegram.
 
 %prep
 %setup -q -n tg
-%patch0 -p0
 
 %if 0%{?rhel} >= 6
 sed -e 's|event2/event.h|event.h|g' -i *.c
@@ -37,12 +38,10 @@ sed -e 's|event2/event.h|event.h|g' -i *.c
 
 %build
 %configure --enable-libconfig --enable-liblua --enable-extf \
-           --with-zlib=%{_prefix} --with-openssl=%{_prefix} \
-           --with-progname=telegram-cli
+ --with-zlib=%{_prefix} --with-openssl=%{_prefix} --with-progname=telegram-cli \
+ --enable-json --enable-extf --disable-valgrind
 
-##%%{?_smp_mflags} originates fails during the code compilation
-##See https://github.com/vysheng/tg/issues/235
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags} -L%{_libdir}" CPPFLAGS=" -I%{_includedir}"
 
 
 %install
@@ -53,6 +52,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/telegram-cli
 mkdir -p %{buildroot}%{_mandir}/man8
 
 install -p -m 0755 bin/telegram-cli %{buildroot}%{_bindir}
+install -p -m 0755 bin/tl-parser %{buildroot}%{_bindir}
+install -p -m 0755 bin/generate %{buildroot}%{_bindir}
 install -p -m 0644 server.pub %{buildroot}%{_sysconfdir}/telegram-cli
 install -p -m 0644 debian/%{name}.8 %{buildroot}%{_mandir}/man8
 
@@ -64,11 +65,18 @@ install -p -m 0644 debian/%{name}.8 %{buildroot}%{_mandir}/man8
 %doc LICENSE
 %endif
 %{_bindir}/telegram-cli
+%{_bindir}/tl-parser
+%{_bindir}/generate
 %dir %{_sysconfdir}/telegram-cli
 %config(noreplace) %{_sysconfdir}/telegram-cli/server.pub
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Fri May 15 2015 Antonio Trande <sagitterATfedoraproject.org> 1.3.1-1.20150114gitd96750
+- Update to 1.3.1
+- Added jansson-devel BR
+- This code can work only in little-endian systems
+
 * Thu Feb 05 2015 Antonio Trande <sagitterATfedoraproject.org> 1.2.0-1.20150114gitd96750
 - Version updated
 - tg-server.pub key excluded
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/telegram-cli.git/commit/?h=f22&id=208fc0a4aee15435c4087b4db49ebfa424846d0b