re-add desktop file (#170835) use %buildroot consistently
This commit is contained in:
parent
0d2558914c
commit
f784d5f4c1
14
xsane.desktop
Normal file
14
xsane.desktop
Normal 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
28
xsane.spec
@ -1,9 +1,10 @@
|
||||
Name: xsane
|
||||
Summary: An X Window System front-end for the SANE scanner interface.
|
||||
Version: 0.99
|
||||
Release: 4
|
||||
Release: 5
|
||||
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
|
||||
Source1: xsane-install-gimp-plugin
|
||||
Source2: xsane.desktop
|
||||
Patch0: xsane-0.90-htmlview.patch
|
||||
Patch1: xsane-0.99-medium-definitions.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.
|
||||
|
||||
%prep
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf %{buildroot}
|
||||
%setup -q
|
||||
%patch0 -p1 -b .htmlview
|
||||
%patch1 -p1 -b .medium-definitions
|
||||
@ -56,20 +57,27 @@ make clean
|
||||
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 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
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files -f XSANE.lang
|
||||
%defattr(-,root,root)
|
||||
@ -77,13 +85,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/xsane
|
||||
%{_mandir}/man1/*
|
||||
%{_datadir}/sane
|
||||
%dir %{_datadir}/applications
|
||||
%{_datadir}/applications/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*
|
||||
|
||||
%post gimp
|
||||
@ -97,6 +107,10 @@ fi
|
||||
exit 0
|
||||
|
||||
%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
|
||||
- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user