packages: samsung-unified-linux-driver/samsung-unified-linux-driver.spec - ...

[sparky]

Author: sparky                       Date: Fri Jan 28 13:08:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed x86_64 build
- manual adaptation to our spec structure
- adapter, spec was missing cvs keywords

---- Files affected:
packages/samsung-unified-linux-driver:
   samsung-unified-linux-driver.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec
diff -u packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec:1.5 packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec:1.6
--- packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec:1.5	Mon Dec  1 04:36:02 2008
+++ packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec	Fri Jan 28 14:08:09 2011
@@ -1,3 +1,5 @@
+# $Revision$, $Date$
+
 %define		shortname	samsung-unified
 Summary:	Samsung Unified Linux Driver
 Name:		samsung-unified-linux-driver
@@ -24,6 +26,7 @@
 %define		_sanelibdir		%{_libdir}/sane
 
 %description
+Samsung Unified Linux Driver
 
 %package -n cups-driver-%{shortname}
 Summary:	CUPS part of Samsung Unified Linux Driver
@@ -33,6 +36,7 @@
 Requires:	ghostscript
 
 %description -n cups-driver-%{shortname}
+CUPS part of Samsung Unified Linux Driver
 
 %package -n sane-driver-%{shortname}
 Summary:	SANE part of Samsung Unified Linux Driver
@@ -41,37 +45,39 @@
 Requires:	sane
 
 %description -n sane-driver-%{shortname}
+SANE part of Samsung Unified Linux Driver
 
 %prep
 %setup -q -n cdroot
 
 %build
-cd Linux/%{drvarch}/at_root/%{_libdir}
+test -d Linux/%{drvarch}/at_root/%{_libdir}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 install -d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/sane.d/ \
 	$RPM_BUILD_ROOT%{_sanelibdir} \
 	$RPM_BUILD_ROOT%{_cupsfilterdir} \
 	$RPM_BUILD_ROOT%{_cupsppddir}/samsung/cms/
-install -m 0644 \
+install \
 	Linux/noarch/at_root/%{_sysconfdir}/sane.d/smfp.conf \
 	$RPM_BUILD_ROOT%{_sysconfdir}/sane.d/
-install -m 0644 \
+install \
 	Linux/noarch/at_opt/share/ppd/*.ppd \
 	$RPM_BUILD_ROOT%{_cupsppddir}/samsung/
-install -m 0644 \
+install \
 	Linux/noarch/at_opt/share/ppd/cms/* \
 	$RPM_BUILD_ROOT%{_cupsppddir}/samsung/cms/
-install -m 0755 \
+install \
 	Linux/%{drvarch}/at_root/%{_libdir}/libmfp* \
 	$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 -m 0755 \
-	Linux/%{drvarch}/at_root/usr/lib/cups/filter/* \
+install \
+	Linux/%{drvarch}/at_root%{_libdir}/cups/filter/* \
 	$RPM_BUILD_ROOT%{_cupsfilterdir}
-install -m 0755 \
+install \
 	Linux/%{drvarch}/at_root/%{_sanelibdir}/libsane-smfp* \
 	$RPM_BUILD_ROOT%{_sanelibdir}
 
@@ -80,7 +86,8 @@
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libmfp*
+%attr(755,root,root) %{_libdir}/libmfp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmfp.so.?
 
 %files -n cups-driver-%{shortname}
 %defattr(644,root,root,755)
@@ -90,6 +97,7 @@
 %{_cupsppddir}/samsung/cms/*
 
 %files -n sane-driver-%{shortname}
+%defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(755,root,root) %{_sanelibdir}/libsane-smfp*
 
@@ -99,6 +107,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/01/28 13:08:09  sparky
+- fixed x86_64 build
+- manual adaptation to our spec structure
+- adapter, spec was missing cvs keywords
+
 Revision 1.5  2008/12/01 03:36:02  emes
 - include all intel 86 archs
 
@@ -113,4 +126,3 @@
 
 Revision 1.1  2008/11/22 18:26:10  emes
 - initial release, CUPS part WorksForMe
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samsung-unified-linux-driver/samsung-unified-linux-driver.spec?r1=1.5&r2=1.6&f=u