Fix runtime dependency: 's!lipreport!libreport!g' (#1536580)

Prefer %%global over %%define
Remove obsolete %%defattr(-,root,root,-)
This commit is contained in:
Björn Esser 2018-01-19 17:59:12 +01:00
parent b748a74d0a
commit 870ec3c38b
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
1 changed files with 13 additions and 11 deletions

View File

@ -1,7 +1,7 @@
Summary: Helps troubleshoot SELinux problems Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot Name: setroubleshoot
Version: 3.3.15 Version: 3.3.15
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: https://pagure.io/setroubleshoot URL: https://pagure.io/setroubleshoot
@ -13,7 +13,7 @@ BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel aud
BuildRequires: python3-libselinux python3-pydbus python3-gobject gtk3-devel BuildRequires: python3-libselinux python3-pydbus python3-gobject gtk3-devel
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server = %{version}-%{release}
Requires: gtk3, libnotify Requires: gtk3, libnotify
Requires: libreport-gtk >= 2.2.1-2, lipreport-python3 Requires: libreport-gtk >= 2.2.1-2, libreport-python3
Requires: python3-gobject, python3-pydbus Requires: python3-gobject, python3-pydbus
Requires(post): desktop-file-utils Requires(post): desktop-file-utils
Requires(post): dbus Requires(post): dbus
@ -24,13 +24,13 @@ BuildRequires: xdg-utils
Requires: xdg-utils Requires: xdg-utils
%global pkgpythondir %{python3_sitelib}/%{name} %global pkgpythondir %{python3_sitelib}/%{name}
%define pkgguidir %{_datadir}/%{name}/gui %global pkgguidir %{_datadir}/%{name}/gui
%define pkgdatadir %{_datadir}/%{name} %global pkgdatadir %{_datadir}/%{name}
%define pkglibexecdir %{_prefix}/libexec/%{name} %global pkglibexecdir %{_prefix}/libexec/%{name}
%define pkgvardatadir %{_localstatedir}/lib/%{name} %global pkgvardatadir %{_localstatedir}/lib/%{name}
%define pkgconfigdir %{_sysconfdir}/%{name} %global pkgconfigdir %{_sysconfdir}/%{name}
%global pkgdatabase %{pkgvardatadir}/setroubleshoot_database.xml %global pkgdatabase %{pkgvardatadir}/setroubleshoot_database.xml
%define username setroubleshoot %global username setroubleshoot
%description %description
setroubleshoot GUI. Application that allows you to view setroubleshoot-server setroubleshoot GUI. Application that allows you to view setroubleshoot-server
@ -41,7 +41,6 @@ about the problem and help track its resolution. Alerts can be configured
to user preference. The same tools can be run on existing log files. to user preference. The same tools can be run on existing log files.
%files %files
%defattr(-,root,root,-)
%{pkgguidir} %{pkgguidir}
%config(noreplace) %{_sysconfdir}/xdg/autostart/* %config(noreplace) %{_sysconfdir}/xdg/autostart/*
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
@ -128,7 +127,6 @@ chown -R setroubleshoot:setroubleshoot %{pkgvardatadir}
rm -rf %{buildroot} rm -rf %{buildroot}
%files server -f %{name}.lang %files server -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/sealert %{_bindir}/sealert
%{_sbindir}/sedispatch %{_sbindir}/sedispatch
%{_sbindir}/setroubleshootd %{_sbindir}/setroubleshootd
@ -204,10 +202,14 @@ Requires: %{name} = %{version}-%{release}
SELinux troubleshoot legacy applet SELinux troubleshoot legacy applet
%files legacy %files legacy
%defattr(-,root,root,-)
%{_bindir}/seappletlegacy %{_bindir}/seappletlegacy
%changelog %changelog
* Fri Jan 19 2018 Björn Esser <besser82@fedoraproject.org> - 3.3.15-2
- Fix runtime dependency: 's!lipreport!libreport!g' (#1536580)
- Prefer %%global over %%define
- Remove obsolete %%defattr(-,root,root,-)
* Fri Jan 19 2018 Petr Lautrbach <plautrba@redhat.com> - 3.3.15-1 * Fri Jan 19 2018 Petr Lautrbach <plautrba@redhat.com> - 3.3.15-1
- Rewrite seapplet to Python3 to use Notify and Gtk 3.0 - Rewrite seapplet to Python3 to use Notify and Gtk 3.0
- Add setroubleshoot-seappletlegacy with legacy seappletlegacy based on Gtk 2 - Add setroubleshoot-seappletlegacy with legacy seappletlegacy based on Gtk 2