Fix vendor tag handling.
This commit is contained in:
parent
0f8a538982
commit
fc42da38eb
13
xsane.spec
13
xsane.spec
@ -22,7 +22,7 @@
|
||||
Name: xsane
|
||||
Summary: X Window System front-end for the SANE scanner interface
|
||||
Version: 0.998
|
||||
Release: 19%{?dist}
|
||||
Release: 20%{?dist}
|
||||
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
|
||||
Source1: xsane-256x256.png
|
||||
# distro-specific: use "xdg-open" instead of "netscape" to launch help browser
|
||||
@ -172,7 +172,7 @@ install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}
|
||||
# install customized desktop file
|
||||
rm %{buildroot}%{_datadir}/applications/xsane.desktop
|
||||
desktop-file-install \
|
||||
%if %{with desktop_vendor_tag}
|
||||
%if 0%{?with_desktop_vendor_tag}
|
||||
--vendor fedora \
|
||||
%endif
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
@ -213,11 +213,7 @@ fi
|
||||
%doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.COPYING xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
|
||||
%{_bindir}/xsane
|
||||
%{_mandir}/man1/*
|
||||
%if %{with desktop_vendor_tag}
|
||||
%{_datadir}/applications/fedora-xsane.desktop
|
||||
%else
|
||||
%{_datadir}/applications/xsane.desktop
|
||||
%endif
|
||||
%{_datadir}/applications/*xsane.desktop
|
||||
%{_datadir}/pixmaps/xsane.xpm
|
||||
%{iconrootdir}
|
||||
|
||||
@ -232,6 +228,9 @@ fi
|
||||
%{_datadir}/sane/xsane
|
||||
|
||||
%changelog
|
||||
* Tue May 14 2013 Jon Ciesla <limburgher@gmail.com> - 0.998-20
|
||||
- Re-fix vendor tag logic.
|
||||
|
||||
* Fri Mar 08 2013 Nils Philippsen <nils@redhat.com> - 0.998-19
|
||||
- fix vendor tag retaining logic (thanks to Toshio Kuratomi)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user