Browse Source

sane 1.0.21-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7338 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 11 years ago
parent
commit
67d281153a
1 changed files with 18 additions and 2 deletions
  1. 18 2
      s/sane/sane-vl.spec

+ 18 - 2
s/sane/sane-vl.spec

@@ -3,11 +3,13 @@
 # To make nosrc.rpm
 # rpm -bs --define 'nosrc:1'
 
+%define build_html 0
+
 Summary:	SANE -- Easy local and networked scanner access
 Summary(ja):	スキャナ操作ツール
 Name:		sane
 Version:	1.0.21
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 URL:		http://www.sane-project.org/
 Source:		ftp://ftp.sane-project.org/pub/sane/%{name}-backends-%{version}.tar.gz
 Source10:       sane-hierarchy.png
@@ -32,6 +34,8 @@ Buildroot: 	%{_tmppath}/%{name}-%{version}-root
 %{?src:%define _src 1}
 %{?!src:%define _src 0}
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 SANE (Scanner Access Now Easy) is a sane and simple interface
@@ -98,6 +102,7 @@ cat dll.conf | %__sed "s/^\([^#]\)/#\1/" > dll.conf~
 echo "#usb /dev/usb/scanner0" >> epson.conf
 )
 
+%if %{build_html}
 ( cd doc
   %__make html
   %__mv sane html
@@ -110,6 +115,7 @@ echo "#usb /dev/usb/scanner0" >> epson.conf
   %__rm -f WARNINGS
 )
 [ -d doc/html ] || %__mkdir doc/html
+%endif
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
@@ -119,8 +125,10 @@ echo "#usb /dev/usb/scanner0" >> epson.conf
 %__install -m755 tools/umax_pp $RPM_BUILD_ROOT%{_bindir}
 %__cp tools/README README.tools
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/%{name}
+%if %{build_html}
 %__cp doc/*.html doc/*.png doc/*.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}
 ##%__mv doc/*.html doc/*.png doc/*.jpg doc/html
+%endif
 
 pushd $RPM_BUILD_ROOT%{_bindir}
 %__ln_s sane-find-scanner find-scanner
@@ -169,7 +177,10 @@ fi
 %files
 %defattr(-,root,root)
 %doc README* AUTHORS ChangeLog* COPYING LICENSE PROBLEMS PROJECTS NEWS
-%doc doc/figs doc/icons doc/html doc/canon doc/mustek doc/mustek_usb doc/umax
+%doc doc/figs doc/icons doc/canon doc/mustek doc/mustek_usb doc/umax
+%if %{build_html}
+%doc doc/html
+%endif
 %doc doc/*.{txt,tex,sty}
 %doc tools
 %dir %{_sysconfdir}/sane.d
@@ -203,6 +214,11 @@ fi
 #{_libdir}/sane/lib*.la
 
 %changelog
+* Fri Jan 11 2013 IWAI, Masaharu <iwai@alib.jp> 1.0.21-2
+- build with libghoto2 2.5.0-1
+- stop generating HTML manual: missing man2html(1) in current VineSeed
+- add Vendor and Distribution tags
+
 * Sun Jul 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.21-1
 - new upstream release
 - change Patch (from sane-1.0.15-vine.patch to sane-1.0.21-vine.patch)