packages (OLD_BUILD_METHOD): lirc/lirc.spec - partial merge from HEAD

[hawk]

Author: hawk                         Date: Thu May 31 12:25:54 2012 GMT
Module: packages                      Tag: OLD_BUILD_METHOD
---- Log message:
- partial merge from HEAD

---- Files affected:
packages/lirc:
   lirc.spec (1.314 -> 1.314.2.1) 

---- Diffs:

================================================================
Index: packages/lirc/lirc.spec
diff -u packages/lirc/lirc.spec:1.314 packages/lirc/lirc.spec:1.314.2.1
--- packages/lirc/lirc.spec:1.314	Mon Feb 13 22:04:25 2012
+++ packages/lirc/lirc.spec	Thu May 31 14:25:49 2012
@@ -82,6 +82,10 @@
 Requires:	libftdi >= 0.12
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without userspace}
+%define		no_spec_install_post_check_tmpfiles	1
+%endif
+
 %description
 LIRC is a package that allows you to decode and send infra-red signals
 of many (but not all) commonly used remote controls.
@@ -643,9 +647,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_aclocaldir},/dev,/var/{log,run/lirc}} \
-	$RPM_BUILD_ROOT/etc/{lirc,rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %if %{with kernel}
 drivers=%{drivers}
@@ -657,6 +658,10 @@
 %endif
 
 %if %{with userspace}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_aclocaldir},/dev,/var/{log,run/lirc}} \
+	$RPM_BUILD_ROOT/etc/{lirc,rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
@@ -999,6 +1004,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.314.2.1  2012/05/31 12:25:49  hawk
+- partial merge from HEAD
+
 Revision 1.314  2012/02/13 21:04:25  arekm
 - release 24
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/lirc/lirc.spec?r1=1.314&r2=1.314.2.1