Revert "- added tmpfiles.d conf file; rel. 0.2"

This reverts commit f993289d068b9950a5e80e0859cd4008b9c7d56a.

We will simply disable locking instead.

diff --git a/sane-backends.spec b/sane-backends.spec
index 04d93c8bf1835d9e348cba691f1cac0a3dea87ed..f80d757571a214f891d5ccbb9789c00fa39745c8 100644 (file)
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -6,7 +6,7 @@
 %bcond_with    libusb0         # libusb 0.1.x API instead of libusb 1.0
 #
 %define                snap    git20140814
-%define                rel     0.2
+%define                rel     0.1
 #
 Summary:       SANE - easy local and networked scanner access
 Summary(es.UTF-8):     SANE - acceso a scanners en red y locales
@@ -23,12 +23,11 @@ Source0:    http://www.sane-project.org/snapshots/%{name}-%{snap}.tar.gz
 # Source0-md5: 94f93862827d929e10b7a11aebfb8cbd
 Source1:       %{name}.rc-inetd
 Source2:       %{name}.m4
-Source3:       %{name}.tmpfiles
 Patch0:                %{name}-lockpath_group.patch
 Patch1:                %{name}-mustek-path.patch
 Patch2:                %{name}-spatc.patch
 Patch4:                %{name}-link.patch
-Patch5:                %{name}-1.0.23-sane-config-multilib.patch
+Patch5:                sane-backends-1.0.23-sane-config-multilib.patch
 URL:           http://www.sane-project.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -285,14 +284,13 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-inetd,%{_aclocaldir},/var/lock/sane,%{systemdtmpfilesdir}}
+install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-inetd,%{_aclocaldir},/var/lock/sane}
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/saned
 install %{SOURCE2} $RPM_BUILD_ROOT%{_aclocaldir}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %ifarch %{ix86} %{x8664}
 install tools/mustek600iin-off $RPM_BUILD_ROOT%{_bindir}
@@ -486,7 +484,6 @@ fi
 %attr(755,root,root) %{_libdir}/sane/libsane-umax1220u.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-umax_pp.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-xerox_mfp.so.*
-%{systemdtmpfilesdir}/%{name}.conf
 %dir %attr(775,root,usb) /var/lock/sane
 %{_mandir}/man1/sane-find-scanner.1*
 %{_mandir}/man1/scanimage.1*

diff --git a/sane-backends.tmpfiles b/sane-backends.tmpfiles
deleted file mode 100644 (file)
index 11d1c96..0000000
--- a/sane-backends.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lock/sane 0755 root usb -