unify, adapter

diff --git a/samsung-unified-linux-driver.spec b/samsung-unified-linux-driver.spec
index cac0924553c493bc841a31b6c15f10e8ac6195a0..9b2b28719c6c3ee41fb355e3043e125669bb84b7 100644 (file)
--- a/samsung-unified-linux-driver.spec
+++ b/samsung-unified-linux-driver.spec
@@ -15,6 +15,7 @@ Name:         %{base_name}-installer
 %endif
 Version:       1.00.27.04
 Release:       %{rel}%{?with_license_agreement:wla}
+Epoch:         1
 License:       non-distributable
 Group:         Applications
 %if %{with license_agreement}
@@ -26,16 +27,15 @@ Source1:    http://svn.pld-linux.org/svn/license-installer/license-installer.sh
 # Source3-md5: 329c25f457fea66ec502b7ef70cb9ede
 %endif
 %if %{with license_agreement}
+BuildRequires: cups-devel
 BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: sed >= 4.0
-BuildRequires: cups-devel
 %else
 Requires:      rpm-build-tools >= 4.4.37
 Requires:      rpmbuild(macros) >= 1.544
 %endif
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Epoch:         1
 
 %ifarch %{ix86}
 %define        drvarch i386
@@ -98,34 +98,34 @@ cp -p %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 %else
 install -d \
        $RPM_BUILD_ROOT%{_bindir} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/sane.d/ \
+       $RPM_BUILD_ROOT%{_sysconfdir}/sane.d \
        $RPM_BUILD_ROOT%{_sanelibdir} \
        $RPM_BUILD_ROOT%{_cupsfilterdir} \
-       $RPM_BUILD_ROOT%{_cupsppddir}/samsung/cms/
-install \
+       $RPM_BUILD_ROOT%{_cupsppddir}/samsung/cms
+cp -p \
        noarch/%{_sysconfdir}/smfp.conf \
-       $RPM_BUILD_ROOT%{_sysconfdir}/sane.d/
-install \
+       $RPM_BUILD_ROOT%{_sysconfdir}/sane.d
+cp -p \
        noarch/share/ppd/*.ppd \
-       $RPM_BUILD_ROOT%{_cupsppddir}/samsung/
-install \
+       $RPM_BUILD_ROOT%{_cupsppddir}/samsung
+cp -p \
        noarch/share/ppd/cms/* \
        $RPM_BUILD_ROOT%{_cupsppddir}/samsung/cms/
-install \
+install -p \
        %{drvarch}/libscmssc.so \
        $RPM_BUILD_ROOT%{_libdir}
 #ln -s libmfp.so.1.0.1 $RPM_BUILD_ROOT%{_libdir}/libmfp.so.1
 #ln -s libmfp.so.1 $RPM_BUILD_ROOT%{_libdir}/libmfp.so
-install \
+install -p \
        %{drvarch}/{pstosecps,rastertospl} \
        $RPM_BUILD_ROOT%{_cupsfilterdir}
-install \
+install -p \
        %{drvarch}/libsane-smfp* \
        $RPM_BUILD_ROOT%{_sanelibdir}
-install \
+install -p \
        %{drvarch}/smfpnetdiscovery \
        $RPM_BUILD_ROOT%{_bindir}
-%{__cp} noarch/license/eula.txt eula.txt
+cp -p noarch/license/eula.txt eula.txt
 %endif
 
 %clean
@@ -146,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/smfpnetdiscovery
 %attr(755,root,root) %{_cupsfilterdir}/*
-%dir %{_cupsppddir}/samsung/
+%dir %{_cupsppddir}/samsung
 %{_cupsppddir}/samsung/*.ppd
 %dir %{_cupsppddir}/samsung/cms
 %{_cupsppddir}/samsung/cms/*