- eeh, binary blobs included - install them, EA: x86*

  (libbrcolm* maybe optional, but libbrscandec* required)
- added copying.brother to doc (GPL for open-source parts, proprierary for blobs)
- added paths patch to kill /usr/local/Brother, install data

Changed files:
    brscan.spec -> 1.4

diff --git a/brscan.spec b/brscan.spec
index 4736755ce770155f04f8429c4f668ee637aac25f..4bc2e5edc23aef97ea9c41ecfef8383d45cc840f 100644 (file)
--- a/brscan.spec
+++ b/brscan.spec
@@ -4,17 +4,19 @@ Summary(pl.UTF-8):    Sterownik do skanerów Brother
 Name:          brscan
 Version:       0.2.3
 Release:       1
-License:       GPL v2
+License:       GPL v2+/proprietary binary modules
 Group:         Applications
 Source0:       http://solutions.brother.com/Library/sol/printer/linux/rpmfiles/sane_source/%{name}-src-%{version}.tar.gz
 # Source0-md5: 99a7f21fc15661690b296023253bcca6
 Patch0:                %{name}-fixes.patch
+Patch1:                %{name}-paths.patch
 URL:           http://solutions.brother.com/linux/sol/printer/linux/sane_drivers.html
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.10
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 Requires:      sane-backends
+ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,50 +29,74 @@ sieciowych.
 %prep
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
+%patch1 -p1
+
+rm -f brscan/{acinclude.m4,configure}
+
+%{__make} -C brscan/lib clean
+%{__make} -C brscan/sanei clean
 
 %build
 cd brscan
-rm configure acinclude.m4
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-#%%{__autoheader}
-#%%{__automake}
-%configure
+%configure \
+       --disable-static
 %{__make} -C lib
 %{__make} -C netconfig
 %{__make} -C sanei
 %{__make} -C backend_brscan
 %{__make} -C backend_brscan2
 
-#%{__make} \
-#      CFLAGS="%{rpmcflags}" \
-#      LDFLAGS="%{rpmldflags}"
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/sane}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/sane,%{_datadir}/brscan,%{_sysconfdir}/brscan,/var/log/brscan}
 
-cd brscan
-cd backend_brscan
-libtool --mode=install install libsane-brother.la $RPM_BUILD_ROOT%{_libdir}/sane
-cd ..
-cd backend_brscan2
-libtool --mode=install install libsane-brother2.la $RPM_BUILD_ROOT%{_libdir}/sane
-cd ..
-cd netconfig
-libtool --mode=install install brsaneconfig $RPM_BUILD_ROOT%{_sbindir}
-libtool --mode=install install brsaneconfig2 $RPM_BUILD_ROOT%{_sbindir}
-cd ..
+libtool --mode=install install brscan/backend_brscan/libsane-brother.la $RPM_BUILD_ROOT%{_libdir}/sane
+libtool --mode=install install brscan/backend_brscan2/libsane-brother2.la $RPM_BUILD_ROOT%{_libdir}/sane
+libtool --mode=install install brscan/netconfig/brsaneconfig $RPM_BUILD_ROOT%{_sbindir}
+libtool --mode=install install brscan/netconfig/brsaneconfig2 $RPM_BUILD_ROOT%{_sbindir}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/sane/*.la
+
+%ifarch %{ix86}
+install brscan/libbrcolm/libbrcolm.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+install brscan/libbrcolm2/libbrcolm2.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+install brscan/libbrscandec/libbrscandec.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+install brscan/libbrscandec2/libbrscandec2.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+%endif
+%ifarch %{x8664}
+install brscan64/libbrcolm/libbrcolm.so.1.0.1 $RPM_BUILD_ROOT%{_libdir}
+install brscan64/libbrcolm2/libbrcolm2.so.1.0.1 $RPM_BUILD_ROOT%{_libdir}
+install brscan64/libbrscandec/libbrscandec.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+install brscan64/libbrscandec2/libbrscandec2.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
+%endif
+
+cp -rf brscan/libbrcolm/GrayCmData $RPM_BUILD_ROOT%{_datadir}/brscan
+cp -rf brscan/libbrcolm2/GrayCmData/* $RPM_BUILD_ROOT%{_datadir}/brscan/GrayCmData
+install brscan/mk_package/Brsane*.ini $RPM_BUILD_ROOT%{_datadir}/brscan
+install brscan/mk_package/brsanenetdevice*.cfg $RPM_BUILD_ROOT%{_sysconfdir}/brscan
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
+%doc brscan/copying.brother
 %attr(755,root,root) %{_sbindir}/brsaneconfig
 %attr(755,root,root) %{_sbindir}/brsaneconfig2
-%attr(755,root,root) %{_libdir}/sane/lib*.so*
+%attr(755,root,root) %{_libdir}/libbrcolm.so.*.*.*
+%attr(755,root,root) %{_libdir}/libbrcolm2.so.*.*.*
+%attr(755,root,root) %{_libdir}/libbrscandec.so.*.*.*
+%attr(755,root,root) %{_libdir}/libbrscandec2.so.*.*.*
+%attr(755,root,root) %{_libdir}/sane/libsane-brother.so.*
+%attr(755,root,root) %{_libdir}/sane/libsane-brother2.so.*
+%{_datadir}/brscan
+%dir %{_sysconfdir}/brscan
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/brscan/brsanenetdevice.cfg
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/brscan/brsanenetdevice2.cfg
+%dir /var/log/brscan