Merge Review (#226658):

- replace %desktop_vendor macro with "fedora"
- fix xsane-gimp requirements
- move EULA and documentation into -common subpackage

xsane.spec

@@ -1,11 +1,10 @@
 # if you rebuild, please change bugtracker_url accordingly:
 %global bugtracker_url http://bugzilla.redhat.com
-%global desktop_vendor fedora
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.997
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -24,6 +23,7 @@ BuildRequires: sane-backends-devel >= 1.0.19-15
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
+Requires: xsane-common
 
 %description
 XSane is an X based interface for the SANE (Scanner Access Now Easy)
@@ -34,14 +34,23 @@ performing the scan and then manipulating the captured image.
 %package gimp
 Summary: GIMP plug-in providing the SANE scanner interface
 Group: Applications/Multimedia
+Requires: gimp >= 2:2.2.12-4
 Requires(post): gimp >= 2:2.2.12-4
 Requires(preun): gimp >= 2:2.2.12-4
+Requires: xsane-common
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
 interface, but it works as a GIMP plug-in. You must have GIMP
 installed to use this package.
 
+%package common
+Summary: Common files for xsane packages
+Group: Applications/Multimedia
+
+%description
+This package contains common files needed by other xsane packages.
+
 %prep
 %setup -q
 
@@ -78,7 +87,7 @@ install src/xsane-gimp %{buildroot}%{_bindir}
 
 # use our own desktop file
 rm %{buildroot}%{_datadir}/applications/xsane.desktop
-desktop-file-install --vendor %{desktop_vendor}         \
+desktop-file-install --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
@@ -107,19 +116,26 @@ 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/*
-%{_datadir}/sane
+%{_datadir}/applications/fedora-xsane.desktop
-%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
 %{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
-%dir %{_datadir}/sane
-%dir %{_datadir}/sane/xsane
-%{_datadir}/sane/xsane/*eula*
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
+%files common
+%defattr(-,root,root)
+%dir %{_datadir}/sane
+%{_datadir}/sane/xsane
+
 %changelog
+* Wed Aug 05 2009 Nils Philippsen <nils@redhat.com> 0.997-3
+- Merge Review (#226658):
+  - replace %%desktop_vendor macro with "fedora"
+  - fix xsane-gimp requirements
+  - move EULA and documentation into -common subpackage
+
 * Mon Aug 03 2009 Nils Philippsen <nils@redhat.com> 0.997-2
 - remove ExcludeArch: s390 s390x