rpms/xsane
5
0
Fork 0
Code Issues Pull Requests Releases Activity

re-add desktop file (#170835) use %buildroot consistently

Browse Source
This commit is contained in:
Nils Philippsen 2006-06-08 08:19:07 +00:00
parent 0d2558914c
commit f784d5f4c1
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xsane.desktop Normal file
View File

@ -0,0 +1,14 @@
[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

28
xsane.spec
View File

@ -1,9 +1,10 @@
Name: xsane Name: xsane
Summary: An X Window System front-end for the SANE scanner interface. Summary: An X Window System front-end for the SANE scanner interface.
Version: 0.99 Version: 0.99
Release: 4 Release: 5
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-install-gimp-plugin Source1: xsane-install-gimp-plugin
Source2: xsane.desktop
Patch0: xsane-0.90-htmlview.patch Patch0: xsane-0.90-htmlview.patch
Patch1: xsane-0.99-medium-definitions.patch Patch1: xsane-0.99-medium-definitions.patch
Patch2: xsane-0.92_gimp2.0.patch Patch2: xsane-0.92_gimp2.0.patch
@ -35,7 +36,7 @@ interface, but it works as a GIMP plug-in. You must have GIMP
installed to use this package. installed to use this package.
%prep %prep
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%setup -q %setup -q
%patch0 -p1 -b .htmlview %patch0 -p1 -b .htmlview
%patch1 -p1 -b .medium-definitions %patch1 -p1 -b .medium-definitions
@ -56,20 +57,27 @@ make clean
make LDFLAGS= make LDFLAGS=
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%makeinstall %makeinstall
install src/xsane-gimp %{buildroot}%{_bindir} install src/xsane-gimp %{buildroot}%{_bindir}
mkdir -p %{buildroot}/etc/X11/applnk/Graphics
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
mkdir %{buildroot}%{_datadir}/applications
desktop-file-install --vendor net --delete-original \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Red-Hat-Base \
--add-category Graphics \
--add-category Application \
%{SOURCE2}
%find_lang %{name} XSANE.lang %find_lang %{name} XSANE.lang
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%files -f XSANE.lang %files -f XSANE.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -77,13 +85,15 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xsane %{_bindir}/xsane
%{_mandir}/man1/* %{_mandir}/man1/*
%{_datadir}/sane %{_datadir}/sane
%dir %{_datadir}/applications
%{_datadir}/applications/xsane.desktop
%files gimp %files gimp
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/xsane-gimp %{_bindir}/xsane-gimp
%{_sbindir}/xsane-install-gimp-plugin %{_sbindir}/xsane-install-gimp-plugin
%%dir %{_datadir}/sane %dir %{_datadir}/sane
%%dir %{_datadir}/sane/xsane %dir %{_datadir}/sane/xsane
%{_datadir}/sane/xsane/*eula* %{_datadir}/sane/xsane/*eula*
%post gimp %post gimp
@ -97,6 +107,10 @@ fi
exit 0 exit 0
%changelog %changelog
* Thu Jun 08 2006 Nils Philippsen <nphilipp@redhat.com> - 0.99-5
- re-add desktop file (#170835)
- use %%buildroot consistently
* Wed Apr 05 2006 Nils Philippsen <nphilipp@redhat.com> - 0.99-4 * Wed Apr 05 2006 Nils Philippsen <nphilipp@redhat.com> - 0.99-4
- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression - use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression