From a690c6e78dc5bfffa21238827c42a235859984fe Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 May 2017 12:25:01 -0400 Subject: [PATCH] rebuild for new tslib --- efl-1.11.4-tslibfix.patch | 12 ------------ efl.spec | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 efl-1.11.4-tslibfix.patch diff --git a/efl-1.11.4-tslibfix.patch b/efl-1.11.4-tslibfix.patch deleted file mode 100644 index 94e8526..0000000 --- a/efl-1.11.4-tslibfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up efl-1.18.0/configure.ac.tslibfix efl-1.18.0/configure.ac ---- efl-1.18.0/configure.ac.tslibfix 2016-08-29 15:35:41.784900935 -0400 -+++ efl-1.18.0/configure.ac 2016-08-29 15:35:48.936847061 -0400 -@@ -3442,7 +3442,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo] - EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl]) - EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) - --EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) -+EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib-0.0]) - EFL_ADD_FEATURE([ECORE_FB], [tslib]) - - EFL_EVAL_PKGS([ECORE_FB]) diff --git a/efl.spec b/efl.spec index 4c59af0..e034192 100644 --- a/efl.spec +++ b/efl.spec @@ -30,13 +30,11 @@ Name: efl Version: 1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz -# I think this one is Fedora specific. -Patch0: efl-1.11.4-tslibfix.patch # There is probably a way to conditionalize this in the code that could go upstream # but this works for now. Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch @@ -185,7 +183,6 @@ Development files for EFL. %prep %setup -q -%patch0 -p1 -b .tslibfix # Technically, this conditional covers "all rhel (fedora is unset and 0 < 22) and fedora 22 or less". # We currently only build for rhel7 and fedora 22. # When RHEL 8 comes out, this will need to be adjusted. @@ -540,6 +537,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon May 15 2017 Tom Callaway - 1.18.1-2 +- rebuild for new tslib + * Wed Sep 21 2016 Tom Callaway - 1.18.1-1 - update to 1.18.1