rpms/xsane/FC-5 xsane.conf.in, NONE, 1.1 xsane.desktop, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xsane.spec, 1.33, 1.34 xsane-0.99-buffer.patch, 1.1, NONE

Mon Aug 28 07:16:57 UTC 2006

Author: nphilipp

Update of /cvs/dist/rpms/xsane/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25410

Modified Files:
	.cvsignore sources xsane.spec 
Added Files:
	xsane.conf.in xsane.desktop 
Removed Files:
	xsane-0.99-buffer.patch 
Log Message:
version 0.991
remove obsolete buffer patch
revamp scheme for integrating external GIMP plugins (#202545)
use disttag
re-add desktop file (#170835)
use %buildroot consistently
add automake, autoconf build requirements

--- NEW FILE xsane.conf.in ---
PLUGINFILE=@BINDIR@/xsane-gimp


--- NEW FILE xsane.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Type=Application
#Name=XSane
Name=Scanner Tool
GenericName=Scanner Tool
Comment=Scan images to view, copy, fax or email them
Exec=xsane
TryExec=xsane
Icon=/usr/share/sane/xsane/xsane-logo.xpm
Terminal=false
Categories=Application;Graphics;2DGraphics;RasterGraphics;GTK;
StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Jan 2006 17:20:03 -0000	1.13
+++ .cvsignore	28 Aug 2006 07:16:55 -0000	1.14
@@ -1 +1 @@
-xsane-0.99.tar.gz
+xsane-0.991.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Jan 2006 17:20:03 -0000	1.13
+++ sources	28 Aug 2006 07:16:55 -0000	1.14
@@ -1 +1 @@
-c850be334dcd36d426d5d85c7334275a  xsane-0.99.tar.gz
+cded872f2e7041f4a0f2dc4f0bbc5a77  xsane-0.991.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/xsane.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xsane.spec	5 Apr 2006 07:14:50 -0000	1.33
+++ xsane.spec	28 Aug 2006 07:16:55 -0000	1.34
@@ -1,21 +1,26 @@
+%define desktop_vendor fedora
+
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.99
-Release: 2.2.fc5.4
+Version: 0.991
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
-Source1: xsane-install-gimp-plugin
+Source1: xsane.desktop
+Source2: xsane.conf.in
 Patch0: xsane-0.90-htmlview.patch
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
-Patch3: xsane-0.99-buffer.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-buildroot
-BuildPrereq: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: sed
 ExcludeArch: s390 s390x
 
 %description
@@ -27,7 +32,8 @@
 %package gimp
 Summary: A GIMP plug-in which provides the SANE scanner interface.
 Group: Applications/Multimedia
-Prereq: /usr/bin/awk sh-utils fileutils
+Requires(post): gimp >= 2:2.2.12-4
+Requires(preun): gimp >= 2:2.2.12-4
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
@@ -35,12 +41,11 @@
 installed to use this package.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %setup -q
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
 %patch2 -p1 -b .gimp2.0
-%patch3 -p1 -b .buffer
 
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
@@ -51,25 +56,34 @@
 
 mv src/xsane src/xsane-gimp
 
+sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2}" > xsane.conf
+
 make clean
 %configure --with-install-root=%{buildroot} --disable-gimp
 make LDFLAGS=
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}/etc/X11/applnk/Graphics
-mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
+mkdir %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor %{desktop_vendor}         \
+    --dir %{buildroot}%{_datadir}/applications          \
+    --add-category X-Red-Hat-Base                       \
+    --add-category X-Fedora                             \
+    --add-category Graphics                             \
+    --add-category Application                          \
+    %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
 
+mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
+install -m 0644 xsane.conf %{buildroot}%{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f XSANE.lang
 %defattr(-,root,root)
@@ -77,27 +91,45 @@
 %{_bindir}/xsane
 %{_mandir}/man1/*
 %{_datadir}/sane
+%dir %{_datadir}/applications
+%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
 
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
-%{_sbindir}/xsane-install-gimp-plugin
-%%dir %{_datadir}/sane
-%%dir %{_datadir}/sane/xsane
+%dir %{_datadir}/sane
+%dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
+%{_sysconfdir}/gimp
+%{_sysconfdir}/gimp/plugins.d
+%config %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %post gimp
-%{_sbindir}/xsane-install-gimp-plugin --install
-exit 0
+%{_sbindir}/gimp-plugin-mgr --install xsane
 
 %preun gimp
 if [ $1 = 0 ]; then
-        %{_sbindir}/xsane-install-gimp-plugin --uninstall
+        %{_sbindir}/gimp-plugin-mgr --uninstall xsane
 fi
-exit 0
 
 %changelog
-* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-2.2.fc5.4
+* Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 0.991-1
+- version 0.991
+- remove obsolete buffer patch
+
+* Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-6
+- revamp scheme for integrating external GIMP plugins (#202545)
+- use disttag
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99-5.1
+- rebuild
+
+* Thu Jun 08 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-5
+- re-add desktop file (#170835)
+- use %%buildroot consistently
+- add automake, autoconf build requirements
+
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-4
 - use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
 
 * Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3


--- xsane-0.99-buffer.patch DELETED ---


