SPECS (AC-branch): rpm.spec - nicer way of handling libmagic bcond...

[arekm]

Author: arekm                        Date: Sat Sep  3 14:57:50 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- nicer way of handling libmagic bcond in build

---- Files affected:
SPECS:
   rpm.spec (1.555.2.105 -> 1.555.2.106) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.105 SPECS/rpm.spec:1.555.2.106
--- SPECS/rpm.spec:1.555.2.105	Sat Sep  3 16:43:00 2005
+++ SPECS/rpm.spec	Sat Sep  3 16:57:44 2005
@@ -658,7 +658,6 @@
 mv -f po/{sr,sr at Latn}.po
 
 rm -rf sqlite zlib db db3 popt rpmdb/db.h
-%{?with_system_libmagic:rm -rf file}
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -670,6 +669,18 @@
 done
 
 %build
+%if %{with system_libmagic}
+rm -rf file
+%else
+cd file
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+cd ..
+%endif
+
 %{__libtoolize}
 %{__gettextize}
 %{__aclocal}
@@ -1099,6 +1110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.106  2005/09/03 14:57:44  arekm
+- nicer way of handling libmagic bcond in build
+
 Revision 1.555.2.105  2005/09/03 14:43:00  arekm
 - update for system libmagic
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.105&r2=1.555.2.106&f=u