remove vendor tag, license needs to be in %license (FPG)

This commit is contained in:
Zdenek Dohnal 2018-04-09 09:06:50 +02:00
parent c426ebcfcb
commit 13961aeb8f

View File

@ -1,11 +1,6 @@
# if you rebuild, please change bugtracker_url accordingly: # if you rebuild, please change bugtracker_url accordingly:
%global bugtracker_url http://bugzilla.redhat.com %global bugtracker_url http://bugzilla.redhat.com
# Drop the vendor tag from Fedora 19 on
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
%global with_desktop_vendor_tag 1
%endif
%global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins %global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins
%global iconrootdir %{_datadir}/icons/hicolor %global iconrootdir %{_datadir}/icons/hicolor
@ -15,7 +10,7 @@
Name: xsane Name: xsane
Summary: X Window System front-end for the SANE scanner interface Summary: X Window System front-end for the SANE scanner interface
Version: 0.999 Version: 0.999
Release: 26%{?dist} Release: 27%{?dist}
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-256x256.png Source1: xsane-256x256.png
# use "xdg-open" instead of "netscape" to launch help browser # use "xdg-open" instead of "netscape" to launch help browser
@ -178,9 +173,6 @@ 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 %{with desktop_vendor_tag}
--vendor fedora \
%endif
--dir %{buildroot}%{_datadir}/applications \ --dir %{buildroot}%{_datadir}/applications \
src/xsane.desktop src/xsane.desktop
@ -236,7 +228,8 @@ if [ -L "%{gimpplugindir}/xsane" ]; then
fi fi
%files -f XSANE.lang %files -f XSANE.lang
%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.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
%license xsane.COPYING
%{_bindir}/xsane %{_bindir}/xsane
%{_mandir}/man1/* %{_mandir}/man1/*
%if %{with desktop_vendor_tag} %if %{with desktop_vendor_tag}
@ -253,11 +246,15 @@ fi
%{gimpplugindir}/xsane %{gimpplugindir}/xsane
%files common %files common
%doc xsane.AUTHOR xsane.COPYING %doc xsane.AUTHOR
%license xsane.COPYING
%dir %{_datadir}/sane %dir %{_datadir}/sane
%{_datadir}/sane/xsane %{_datadir}/sane/xsane
%changelog %changelog
* Mon Apr 09 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-27
- remove vendor tag, license needs to be in %%license (FPG)
* Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-26 * Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-26
- remove old stuff - remove old stuff
- gcc is no longer in buildroot by default - gcc is no longer in buildroot by default