Remove the use of desktop-file-install and its vendor prefix override

Instead, just validate the desktop file in %check.
This commit is contained in:
Kalev Lember 2013-05-21 23:51:17 +02:00
parent 7782054f75
commit a9808694fb

View File

@ -47,15 +47,12 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--remove-category Application \
$RPM_BUILD_ROOT%{_datadir}/applications/*
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
%find_lang %{name} --with-gnome
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor-kde.desktop
%postun
if [ $1 -eq 0 ]; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
@ -67,7 +64,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%files -f %{name}.lang
%doc AUTHORS NEWS COPYING README
%{_bindir}/gnome-system-monitor
%{_datadir}/applications/*
%{_datadir}/applications/gnome-system-monitor.desktop
%{_datadir}/applications/gnome-system-monitor-kde.desktop
%{_datadir}/pixmaps/gnome-system-monitor/
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml