diff --git a/lightdm-settings.spec b/lightdm-settings.spec index 29a7abe..e1a0a5c 100644 --- a/lightdm-settings.spec +++ b/lightdm-settings.spec @@ -5,7 +5,7 @@ Summary: Configuration tool for the LightDM display manager License: GPLv3+ URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch @@ -15,15 +15,9 @@ BuildRequires: gettext Requires: filesystem Requires: hicolor-icon-theme Requires: polkit -%if 0%{?fedora} || 0%{?rhel} >= 8 Requires: python3-xapp Requires: python3-gobject Requires: python3-setproctitle -%else # 0%%{?fedora} || 0%%{?rhel} >= 8 -Requires: python-xapp -Requires: python-gobject -Requires: python-setproctitle -%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 Requires: slick-greeter %description @@ -47,17 +41,6 @@ f=".%{_bindir}/%{name}" /bin/touch -r ${f} ${f}.new %{__mv} -f ${f}.new ${f} -# Use Python2 on EPEL <= 7. -%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 %make_build @@ -80,27 +63,11 @@ done %{buildroot}%{_datadir}/applications/*.desktop -%if (0%{?rhel} && 0%{?rhel} <= 7) -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor \ - &>/dev/null || : -fi - -%posttrans -%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor \ - &>/dev/null || : -%endif - %files -f %{name}.lang %license debian/copyright COPYING %doc debian/changelog README.md %{_bindir}/%{name} -%{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/polkit-1/actions/org.x.%{name}.policy