#2 Fix build on RHEL 8 and rawhide. Overhaul spec file.
Closed 2 months ago by kathenas. Opened 3 months ago by kathenas.

@@ -0,0 +1,155 @@

+ From 1880685e4cf1116dee132915f9e545d8e5d2ad31 Mon Sep 17 00:00:00 2001

+ From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

+ Date: Thu, 8 May 2014 15:18:27 +0200

+ Subject: [PATCH] stop hardcoding python's path in .py scripts

+ 

+ https://bugs.freedesktop.org/show_bug.cgi?id=76495

+ ---

+  tests/all-errors-documented.py      | 2 +-

+  tools/c-constants-gen.py            | 2 +-

+  tools/glib-client-gen.py            | 2 +-

+  tools/glib-client-marshaller-gen.py | 2 +-

+  tools/glib-errors-check-gen.py      | 2 +-

+  tools/glib-errors-str-gen.py        | 2 +-

+  tools/glib-ginterface-gen.py        | 2 +-

+  tools/glib-gtypes-generator.py      | 2 +-

+  tools/glib-interfaces-gen.py        | 2 +-

+  tools/gobject-foo.py                | 2 +-

+  tools/make-version-script.py        | 2 +-

+  tools/manager-file.py               | 2 +-

+  tools/xincludator.py                | 2 +-

+  13 files changed, 13 insertions(+), 13 deletions(-)

+ 

+ diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py

+ index ae66df5..911dc76 100755

+ --- a/tests/all-errors-documented.py

+ +++ b/tests/all-errors-documented.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  # Check if all the errors have been added to

+  # docs/reference/telepathy-glib-sections.txt

+  

+ diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py

+ index a08afee..9467e43 100644

+ --- a/tools/c-constants-gen.py

+ +++ b/tools/c-constants-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  from sys import argv, stdout, stderr

+  import xml.dom.minidom

+ diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py

+ index b7edbc0..ea4197e 100644

+ --- a/tools/glib-client-gen.py

+ +++ b/tools/glib-client-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  # glib-client-gen.py: "I Can't Believe It's Not dbus-binding-tool"

+  #

+ diff --git a/tools/glib-client-marshaller-gen.py b/tools/glib-client-marshaller-gen.py

+ index cd9823b..2d0a6e3 100644

+ --- a/tools/glib-client-marshaller-gen.py

+ +++ b/tools/glib-client-marshaller-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  import sys

+  import xml.dom.minidom

+ diff --git a/tools/glib-errors-check-gen.py b/tools/glib-errors-check-gen.py

+ index 3cc8a5a..80bbefe 100644

+ --- a/tools/glib-errors-check-gen.py

+ +++ b/tools/glib-errors-check-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  import sys

+  import xml.dom.minidom

+ diff --git a/tools/glib-errors-str-gen.py b/tools/glib-errors-str-gen.py

+ index ddb1e16..67d7fb0 100644

+ --- a/tools/glib-errors-str-gen.py

+ +++ b/tools/glib-errors-str-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  import sys

+  import xml.dom.minidom

+ diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py

+ index c0ce20d..b7b0ffb 100644

+ --- a/tools/glib-ginterface-gen.py

+ +++ b/tools/glib-ginterface-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  # glib-ginterface-gen.py: service-side interface generator

+  #

+ diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py

+ index 1477bd3..05f026c 100644

+ --- a/tools/glib-gtypes-generator.py

+ +++ b/tools/glib-gtypes-generator.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  # Generate GLib GInterfaces from the Telepathy specification.

+  # The master copy of this program is in the telepathy-glib repository -

+ diff --git a/tools/glib-interfaces-gen.py b/tools/glib-interfaces-gen.py

+ index b67d7b4..7d68b35 100644

+ --- a/tools/glib-interfaces-gen.py

+ +++ b/tools/glib-interfaces-gen.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  from sys import argv, stdout, stderr

+  import xml.dom.minidom

+ diff --git a/tools/gobject-foo.py b/tools/gobject-foo.py

+ index a2abd76..34120b6 100644

+ --- a/tools/gobject-foo.py

+ +++ b/tools/gobject-foo.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  # gobject-foo.py: generate standard GObject type macros etc.

+  #

+ diff --git a/tools/make-version-script.py b/tools/make-version-script.py

+ index 4ced849..72b2fde 100644

+ --- a/tools/make-version-script.py

+ +++ b/tools/make-version-script.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  """Construct a GNU ld or Debian dpkg version-script from a set of

+  RFC822-style symbol lists.

+ diff --git a/tools/manager-file.py b/tools/manager-file.py

+ index e1b51a6..aaa7946 100644

+ --- a/tools/manager-file.py

+ +++ b/tools/manager-file.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  # manager-file.py: generate .manager files and TpCMParamSpec arrays from the

+  # same data (should be suitable for all connection managers that don't have

+ diff --git a/tools/xincludator.py b/tools/xincludator.py

+ index f9ed49c..d63389e 100644

+ --- a/tools/xincludator.py

+ +++ b/tools/xincludator.py

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python

+ +#!/usr/bin/env python2

+  

+  import sys

+  from sys import argv, stdout, stderr

+ -- 

+ 1.9.0

+ 

file modified
+52 -59

@@ -1,104 +1,97 @@

- %global	dbus_ver	0.95

- %global	dbus_glib_ver	0.90

- %global	glib_ver	2.36.0

- %global gobj_ver	1.30

- %global vala_ver	0.16.0

- 

- Name:           telepathy-glib

- Version:        0.24.1

- Release:        12%{?dist}

- Summary:        GLib bindings for Telepathy

- 

- License:        LGPLv2+

- URL:            http://telepathy.freedesktop.org/wiki/FrontPage

- Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz

+ %global	dbus_ver 0.95

+ %global	dbus_glib_ver 0.90

+ %global	glib_ver 2.36.0

+ %global gobj_ver 1.30

+ %global vala_ver 0.16.0

+ 

+ Name: telepathy-glib

+ Version: 0.24.1

+ Release: 13%{?dist}

+ Summary: GLib bindings for Telepathy

+ License: LGPLv2+

+ URL: https://telepathy.freedesktop.org

+ Source0: https://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz

  # https://bugs.freedesktop.org/show_bug.cgi?id=92245

- Patch0:         telepathy-glib-0.24.1-glib246.patch

- 

- BuildRequires:  gtk-doc >= 1.17

- BuildRequires:  dbus-devel >= %{dbus_ver}

- BuildRequires:	dbus-glib-devel >= %{dbus_glib_ver}

- BuildRequires:	glib2-devel >= %{glib_ver}

- BuildRequires:	gobject-introspection-devel >= %{gobj_ver}

- BuildRequires:	vala >= %{vala_ver}

- BuildRequires:	libxslt

- BuildRequires:	python2

+ Patch0: telepathy-glib-0.24.1-glib246.patch

+ # https://bugs.freedesktop.org/show_bug.cgi?id=76495

+ Patch1: 0001-stop-hardcoding-python-s-path-in-.py-scripts.patch

+ 

+ BuildRequires: gcc

+ BuildRequires: gtk-doc >= 1.17

+ BuildRequires: dbus-devel >= %{dbus_ver}

+ BuildRequires: dbus-glib-devel >= %{dbus_glib_ver}

+ BuildRequires: glib2-devel >= %{glib_ver}

+ BuildRequires: gobject-introspection-devel >= %{gobj_ver}

+ BuildRequires: vala >= %{vala_ver}

+ BuildRequires: libxslt

+ BuildRequires: python2

+ BuildRequires: python2-dbusmock

  

  %description

  Telepathy-glib is the glib bindings for the telepathy unified framework

  for all forms of real time conversations, including instant messaging, IRC, 

  voice calls and video calls.

  

- 

  %package vala

- Summary:	Vala bindings for %{name}

- Requires:	%{name} = %{version}-%{release}

- Requires:	vala

- 

+ Summary: Vala bindings for %{name}

+ Requires: %{name} = %{version}-%{release}

+ Requires: vala

  

  %description vala

  Vala bindings for %{name}.

  

- 

- %package 	devel

- Summary:	Development files for %{name}

- Requires:	%{name} = %{version}-%{release}

- Requires:	%{name}-vala = %{version}-%{release}

- Requires:	telepathy-filesystem

- Requires:	dbus-devel >= %{dbus_ver}

- Requires:	dbus-glib-devel >= %{dbus_glib_ver}

- Requires:	glib2-devel >= %{glib_ver}

- Requires:	pkgconfig

- 

+ %package devel

+ Summary: Development files for %{name}

+ Requires: %{name} = %{version}-%{release}

+ Requires: %{name}-vala = %{version}-%{release}

+ Requires: telepathy-filesystem

+ Requires: dbus-devel >= %{dbus_ver}

+ Requires: dbus-glib-devel >= %{dbus_glib_ver}

+ Requires: glib2-devel >= %{glib_ver}

+ Requires: pkgconfig

  

  %description devel

  The %{name}-devel package contains libraries and header files for

  developing applications that use %{name}.

  

- 

  %prep

- %setup -q

- %patch0 -p1

- 

- 

- %check

- make check

- 

+ %autosetup -p1

  

  %build

  %configure --enable-static=no --enable-introspection=yes --enable-vala-bindings=yes

- make %{?_smp_mflags}

- 

+ %make_build

  

  %install

- rm -rf $RPM_BUILD_ROOT

- make install DESTDIR=$RPM_BUILD_ROOT

- find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

+ %make_install

  

+ %check

+ make check

  

  %ldconfig_scriptlets

  

- 

  %files

  %doc AUTHORS COPYING README NEWS

  %{_libdir}/libtelepathy-glib*.so.*

  %{_libdir}/girepository-1.0/TelepathyGLib-0.12.typelib

  

- 

  %files vala

  %{_datadir}/vala/vapi/telepathy-glib.deps

  %{_datadir}/vala/vapi/telepathy-glib.vapi

  

- 

  %files devel

+ %exclude %{_libdir}/libtelepathy-glib.la

  %doc %{_datadir}/gtk-doc/html/%{name}/

+ %{_datadir}/gir-1.0/TelepathyGLib-0.12.gir

+ %{_includedir}/telepathy-1.0/%{name}/

  %{_libdir}/libtelepathy-glib.so

  %{_libdir}/pkgconfig/*.pc

- %{_includedir}/telepathy-1.0/%{name}/

- %{_datadir}/gir-1.0/TelepathyGLib-0.12.gir

- 

  

  %changelog

+ * Thu Jun 27 2019 Phil Wyett <philwyett@kathenas.org> - 0.24.1-13

+ - Add upstream patch: 0001-stop-hardcoding-python-s-path-in-.py-scripts - fixes RHEL 8 build

+ - Update URL and use https for Source0

+ - Update and clean spec file

+ 

  * Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 0.24.1-12

  - Update BRs for vala packaging changes

  

  • Thu Jun 27 2019 Phil Wyett philwyett@kathenas.org - 0.24.1-13
  • Add upstream patch: 0001-stop-hardcoding-python-s-path-in-.py-scripts - fixes RHEL 8 build
  • Update URL and use https for Source0
  • Update and clean spec file

Pull-Request has been closed by kathenas

2 months ago