diff --git a/xsane.spec b/xsane.spec index bbcf476..c6700f6 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,11 +1,6 @@ # if you rebuild, please change bugtracker_url accordingly: %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 iconrootdir %{_datadir}/icons/hicolor @@ -15,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 26%{?dist} +Release: 27%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # 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 rm %{buildroot}%{_datadir}/applications/xsane.desktop desktop-file-install \ -%if %{with desktop_vendor_tag} - --vendor fedora \ -%endif --dir %{buildroot}%{_datadir}/applications \ src/xsane.desktop @@ -236,7 +228,8 @@ if [ -L "%{gimpplugindir}/xsane" ]; then fi %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 %{_mandir}/man1/* %if %{with desktop_vendor_tag} @@ -253,11 +246,15 @@ fi %{gimpplugindir}/xsane %files common -%doc xsane.AUTHOR xsane.COPYING +%doc xsane.AUTHOR +%license xsane.COPYING %dir %{_datadir}/sane %{_datadir}/sane/xsane %changelog +* Mon Apr 09 2018 Zdenek Dohnal - 0.999-27 +- remove vendor tag, license needs to be in %%license (FPG) + * Mon Feb 19 2018 Zdenek Dohnal - 0.999-26 - remove old stuff - gcc is no longer in buildroot by default