rpms/xsane
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix vendor tag logic in a prettier way

Browse Source
This commit is contained in:
Nils Philippsen 2013-05-17 14:07:11 +02:00
parent fc42da38eb
commit 76243283a2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xsane.spec
View File

@ -4,8 +4,6 @@
# Drop the vendor tag from Fedora 19 on # Drop the vendor tag from Fedora 19 on
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
%global with_desktop_vendor_tag 1 %global with_desktop_vendor_tag 1
%else
%global with_desktop_vendor_tag 0
%endif %endif
%global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins %global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins
@ -172,7 +170,7 @@ install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}
# install customized desktop file # install customized desktop file
rm %{buildroot}%{_datadir}/applications/xsane.desktop rm %{buildroot}%{_datadir}/applications/xsane.desktop
desktop-file-install \ desktop-file-install \
%if 0%{?with_desktop_vendor_tag} %if %{with desktop_vendor_tag}
--vendor fedora \ --vendor fedora \
%endif %endif
--dir %{buildroot}%{_datadir}/applications \ --dir %{buildroot}%{_datadir}/applications \
@ -213,7 +211,11 @@ 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 %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 %{_bindir}/xsane
%{_mandir}/man1/* %{_mandir}/man1/*
%{_datadir}/applications/*xsane.desktop %if %{with desktop_vendor_tag}
%{_datadir}/applications/fedora-xsane.desktop
%else
%{_datadir}/applications/xsane.desktop
%endif
%{_datadir}/pixmaps/xsane.xpm %{_datadir}/pixmaps/xsane.xpm
%{iconrootdir} %{iconrootdir}
@ -228,6 +230,9 @@ fi
%{_datadir}/sane/xsane %{_datadir}/sane/xsane
%changelog %changelog
* Fri May 17 2013 Nils Philippsen <nils@redhat.com>
- fix vendor tag logic in a prettier way
* Tue May 14 2013 Jon Ciesla <limburgher@gmail.com> - 0.998-20 * Tue May 14 2013 Jon Ciesla <limburgher@gmail.com> - 0.998-20
- Re-fix vendor tag logic. - Re-fix vendor tag logic.