diff --git a/nemo.spec b/nemo.spec index 83a0f28..27d0c91 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,7 +1,7 @@ Name: nemo Summary: File manager for Cinnamon Version: 3.8.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/ Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -20,11 +20,7 @@ Requires: cinnamon-translations BuildRequires: meson BuildRequires: intltool -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: python3-gobject-base -%else # 0%%{?fedora} || 0%%{?rhel} >= 8 -BuildRequires: pygobject3-base -%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 BuildRequires: desktop-file-utils BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libxml-2.0) @@ -69,16 +65,6 @@ for developing nemo extensions. %prep %autosetup -p1 -%if (0%{?rhel} && 0%{?rhel} >= 7) -for f in $(%{__grep} -Rl '#!.*python3') ; do - %{__sed} -e 's~#!.*python3~#!/usr/bin/python2~g' < ${f} > ${f}.new - /bin/touch -r ${f}.new ${f} - mode="$(%{_bindir}/stat -c '%a' ${f})" - %{__mv} -f ${f}.new ${f} - %{__chmod} -c ${mode} ${f} -done -%endif # (0%%{?rhel} && 0%%{?rhel} >= 7) - %build %meson -D deprecated_warnings=false -D gtk_doc=false %meson_build @@ -86,44 +72,24 @@ done %install %meson_install -install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/nemo-fedora.gschema.override +install -D -m 0644 %{SOURCE1} %buildroot/%{_datadir}/glib-2.0/schemas/nemo-fedora.gschema.override desktop-file-install --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir %buildroot%{_datadir}/applications \ --add-only-show-in X-Cinnamon \ - $RPM_BUILD_ROOT%{_datadir}/applications/* + %buildroot%{_datadir}/applications/* # create extensions directoy -mkdir -p $RPM_BUILD_ROOT%{_libdir}/nemo/extensions-3.0/ +mkdir -p %buildroot%{_libdir}/nemo/extensions-3.0/ #Remove libtool archives. -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f +find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f #Remove icon-theme.cache -rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache -rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache - -%if (0%{?rhel} && 0%{?rhel <= 7}) -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi +rm -f %buildroot%{_datadir}/icons/hicolor/icon-theme.cache +rm -f %buildroot%{_datadir}/icons/hicolor/.icon-theme.cache -%posttrans -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%post extensions -p /sbin/ldconfig - -%postun extensions -p /sbin/ldconfig -%else # (0%%{?rhel} && 0%%{?rhel <= 7}) %ldconfig_scriptlets extensions -%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) %files @@ -157,6 +123,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Sun Oct 07 2018 Leigh Scott - 3.8.6-2 +- Drop EPEL/RHEL support + * Fri Sep 21 2018 Leigh Scott - 3.8.6-1 - Update to 3.8.6 release