#2 Disable gajim for el > 7
Merged 4 years ago by raveit65. Opened 4 years ago by stenstorp.
Unknown source epel8  into  master

file modified
+16 -4
@@ -16,7 +16,7 @@

  Summary:        Set of extensions for caja file manager

  Version:        %{branch}.1

  %if 0%{?rel_build}

- Release:        1%{?dist}

+ Release:        2%{?dist}

  %else

  Release:        0.12%{?git_rel}%{?dist}

  %endif
@@ -25,7 +25,7 @@

  

  # for downloading the tarball use 'spectool -g -R caja.spec'

  # Source for release-builds.

- %{?rel_build:Source0:     http://pub.mate-desktop.org/releases/%{branch}/%%{name}-%%{version}.tar.xz}

+ %{?rel_build:Source0:     http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}

  # Source for snapshot-builds.

  %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}

  
@@ -41,8 +41,10 @@

  BuildRequires:  gtk3-devel

  BuildRequires:  gupnp-devel

  BuildRequires:  dbus-glib-devel

- BuildRequires:  gajim

  

+ %if 0%{?rhel} <= 7 || 0%{?fedora}

+ BuildRequires:  gajim

+ %endif

  

  %description

  Extensions for the caja file-browser, open-terminal,
@@ -143,7 +145,11 @@

       --enable-image-converter  \

       --enable-open-terminal    \

       --enable-sendto           \

-      --with-sendto-plugins=all \

+ %if 0%{?rhel} > 7

+      --with-sendto-plugins=emailclient,caja-burn,pidgin,removable-devices,upnp \

+ %else

+       --with-sendto-plugins=all \

+ %endif

       --enable-share            \

       --enable-gksu             \

       --enable-wallpaper        \
@@ -186,7 +192,9 @@

  %{_libdir}/caja-sendto/plugins/libnstpidgin.so

  %{_libdir}/caja-sendto/plugins/libnstremovable_devices.so

  %{_libdir}/caja-sendto/plugins/libnstupnp.so

+ %if 0%{?rhel} <= 7 || 0%{?fedora}

  %{_libdir}/caja-sendto/plugins/libnstgajim.so

+ %endif

  %{_libdir}/caja/extensions-2.0/libcaja-sendto.so

  %{_datadir}/glib-2.0/schemas/org.mate.Caja.Sendto.gschema.xml

  %{_datadir}/caja-extensions/caja-sendto.ui
@@ -220,6 +228,10 @@

  

  

  %changelog

+ * Sun Sep 29 2019 Thomas Batten <stenstorpmc@gmail.com> - 1.22.1-2

+ - Disable gajim for el > 7

+ - Fix double % in Source0

+ 

  * Wed Sep 18 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-1

  - update to 1.22.1

  

Gajim has a bunch of python2/3 dependencies not packaged in EPEL 8.
Also fix a double % in Source0 preventing source downloads.
(Had to make a new PR, I don't have proper git access)

Thanks, this looks much better.

Pull-Request has been merged by raveit65

4 years ago
Metadata