rpms/xsane/devel xsane.spec,1.75,1.76
Nils Philippsen
nphilipp at fedoraproject.org
Wed Aug 5 12:40:59 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6576
Modified Files:
xsane.spec
Log Message:
Merge Review (#226658):
- replace %desktop_vendor macro with "fedora"
- fix xsane-gimp requirements
- move EULA and documentation into -common subpackage
Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- xsane.spec 3 Aug 2009 16:50:05 -0000 1.75
+++ xsane.spec 5 Aug 2009 12:40:58 -0000 1.76
@@ -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.
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 manipulatin
%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,8 +87,8 @@ install src/xsane-gimp %{buildroot}%{_bi
# use our own desktop file
rm %{buildroot}%{_datadir}/applications/xsane.desktop
-desktop-file-install --vendor %{desktop_vendor} \
- --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --vendor fedora \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
%find_lang %{name} XSANE.lang
@@ -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/%{desktop_vendor}-xsane.desktop
+%{_datadir}/applications/fedora-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 at 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 at redhat.com> 0.997-2
- remove ExcludeArch: s390 s390x
More information about the scm-commits
mailing list