SPECS (AC-branch): rpm.spec - fix build without python, pidof dep in trigger

[glen]

Author: glen                         Date: Sun Oct 26 23:14:56 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix build without python, pidof dep in trigger

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.66 -> 1.837.2.42.2.67) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.66 SPECS/rpm.spec:1.837.2.42.2.67
--- SPECS/rpm.spec:1.837.2.42.2.66	Sun Oct 26 17:39:12 2008
+++ SPECS/rpm.spec	Mon Oct 27 00:14:50 2008
@@ -303,6 +303,7 @@
 Obsoletes:	rpm-libs
 # avoid installing with incompatible (non-tukaani) lzma
 Conflicts:	lzma < 1:4.42.0
+Requires(triggerpostun):	/sbin/pidof
 # avoid SEGV caused by mixed db versions
 Conflicts:	poldek < 0.18.1-16
 
@@ -1066,8 +1067,10 @@
 /{__spec_install_post_compress_modules}/d
 ' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
+%if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%endif
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 
@@ -1130,6 +1133,7 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
+p=$(/sbin/pidof poldek)
 if [ "$p" ]; then
 	echo >&2 "Killing poldek ($p), don't panic :)"
 	kill $p
@@ -1378,6 +1382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.67  2008/10/26 23:14:50  glen
+- fix build without python, pidof dep in trigger
+
 Revision 1.837.2.42.2.66  2008/10/26 16:39:12  glen
 - more complete LSB rpm v3 support from mandriva (can open ooo rpm-s now); rel 89
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.66&r2=1.837.2.42.2.67&f=u