Don't build the nautilus subpackage in a module

It doesn't make sense. One flatpak can't extend another.
epel9
Matthias Clasen 6 years ago
parent 2428fc71bc
commit 6e62420879

@ -12,7 +12,9 @@ BuildRequires: gcc
BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(glib-2.0) >= 2.36
BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2 BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2
%if 0%{?flatpak}
BuildRequires: pkgconfig(libnautilus-extension) >= 2.22.2 BuildRequires: pkgconfig(libnautilus-extension) >= 2.22.2
%endif
BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0 BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0
BuildRequires: pkgconfig(libnotify) >= 0.4.3 BuildRequires: pkgconfig(libnotify) >= 0.4.3
BuildRequires: pkgconfig(libarchive) >= 3.0.0 BuildRequires: pkgconfig(libarchive) >= 3.0.0
@ -27,6 +29,7 @@ BuildRequires: /usr/bin/appstream-util
File Roller is an application for creating and viewing archives files, File Roller is an application for creating and viewing archives files,
such as tar or zip files. such as tar or zip files.
%if 0%{?flatpak}
%package nautilus %package nautilus
Summary: File Roller extension for nautilus Summary: File Roller extension for nautilus
Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
@ -35,6 +38,7 @@ Requires: %{name}%{_isa} = %{version}-%{release}
This package contains the file-roller extension for the nautilus file manager. This package contains the file-roller extension for the nautilus file manager.
It adds an item to the nautilus context menu that lets you compress files It adds an item to the nautilus context menu that lets you compress files
or directories. or directories.
%endif
%prep %prep
%setup -q %setup -q
@ -66,12 +70,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.FileRoller.
%{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
%{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml %{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml
%if 0%{?flatpak}
%files nautilus %files nautilus
%{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
%endif
%changelog %changelog
* Tue Oct 2 2018 Matthias Clasen <mclasen@redhat.com> - 3.30.1-2 * Tue Oct 2 2018 Matthias Clasen <mclasen@redhat.com> - 3.30.1-2
- Avoid gratitious use of %{_bindir}. This breaks module builds - Avoid gratitious use of %{_bindir}. This breaks module builds
- Don't build the nautilus subpackage when doing a module
* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1 * Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
- Update to 3.30.1 - Update to 3.30.1

Loading…
Cancel
Save