diff --git a/.gitignore b/.gitignore index dbd15f1..3171685 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /lightdm-gtk-greeter-settings-1.2.0.tar.gz +/lightdm-gtk-greeter-settings-1.2.2.tar.gz diff --git a/lightdm-gtk-greeter-settings.spec b/lightdm-gtk-greeter-settings.spec index 78f9d87..571313c 100644 --- a/lightdm-gtk-greeter-settings.spec +++ b/lightdm-gtk-greeter-settings.spec @@ -1,71 +1,77 @@ -%global debug_package %{nil} +%global relver 1.2 Name: lightdm-gtk-greeter-settings -Version: 1.2.0 -Release: 7%{?dist} +Version: %{relver}.2 +Release: 1%{?dist} Summary: Settings editor for LightDM GTK+ Greeter + License: GPLv3 URL: https://launchpad.net/lightdm-gtk-greeter-settings -Source0: https://launchpad.net/%{name}/1.2/%{version}/+download/%{name}-%{version}.tar.gz +Source0: https://launchpad.net/%{name}/%{relver}/%{version}/+download/%{name}-%{version}.tar.gz + BuildArch: noarch +BuildRequires: desktop-file-utils +BuildRequires: intltool BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: python3-distutils-extra -BuildRequires: intltool -BuildRequires: desktop-file-utils +BuildRequires: python3-setuptools Requires: lightdm-gtk -Requires: pygobject3 - - +Requires: python3-gobject %description -Just a small dialog to make it easier for users to modify the settings +Just a small dialog to make it easier for users to modify the settings of lightdm-gtk-greeter. + %prep -%setup -q +%autosetup -p 1 +rm -f PKG-INFO # Rename the ubuntu references to fedora sed -i -e 's@com.ubuntu.pkexec@com.fedora.pkexec@g' com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy.in \ po/* mv com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy.in com.fedora.pkexec.lightdm-gtk-greeter-settings.policy.in -rm PKG-INFO %build -%{__python3} setup.py build +%py3_build + %install +# %%py3_install des not work properly here. %{__python3} setup.py install --root=$RPM_BUILD_ROOT --optimize=1 # Remove shebang from files -for lib in $RPM_BUILD_ROOT%{python3_sitelib}/lightdm_gtk_greeter_settings/*.py; do +for lib in %{buildroot}%{python3_sitelib}/lightdm_gtk_greeter_settings/*.py; do sed '1{\@^#!/usr/bin/env python@d}' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done -desktop-file-install \ - --delete-original \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop - %find_lang %{name} + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop + + %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 - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi + %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f %{name}.lang %doc NEWS README %license COPYING @@ -78,7 +84,11 @@ fi %{_datadir}/lightdm-gtk-greeter-settings/ %{_datadir}/polkit-1/actions/com.fedora.pkexec.lightdm-gtk-greeter-settings.policy + %changelog +* Fri Jan 05 2018 Björn Esser - 1.2.2-1 +- New upstream release (rhbz#1530973, 1531497) + * Wed Jul 26 2017 Fedora Release Engineering - 1.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -99,4 +109,3 @@ fi * Sat Jul 04 2015 Leigh Scott - 1.2.0-1 - Initial build - diff --git a/sources b/sources index 09a5cf4..b624677 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99f054012e722d8c42f4c17db7a209a8 lightdm-gtk-greeter-settings-1.2.0.tar.gz +SHA512 (lightdm-gtk-greeter-settings-1.2.2.tar.gz) = 8132234e5a796a336a3fddfa51191c662834bc92212daaa8ff1b0d8d49ed9f53aec970e8538ac1f41bbd1a75b82a532552b08095997217ebf98a996f08f0aa29