Author: arekm                        Date: Sat Sep  3 18:10:27 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel 4; use patched system libmagic

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

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.106 SPECS/rpm.spec:1.555.2.107
--- SPECS/rpm.spec:1.555.2.106  Sat Sep  3 16:57:44 2005
+++ SPECS/rpm.spec      Sat Sep  3 20:10:22 2005
@@ -3,8 +3,6 @@
 # TODO:
 # - python(abi) cap is not provided automatically (because /usr/bin/python 
matches
 #   ELF first; it should be provided by python-libs not binary anyway)
-# - consider using system libmagic not internal libfmagic
-#   (but internal has different method of passing output)
 # 
 # Conditional build:
 %bcond_with    static          # build static rpmi (not supported at the 
moment)
@@ -12,8 +10,8 @@
 %bcond_without autoreqdep      # don't autogenerate package name deps in 
addition to sonames/perl(X)
 %bcond_without python          # don't build python bindings
 %bcond_without selinux         # build without selinux support
+%bcond_without system_libmagic # don't use system libmagic
 %bcond_with    neon            # build with HTTP/WebDAV support (neon library)
-%bcond_with    system_libmagic
 
 # force_cc             - force using __cc other than 
"%{_target_cpu}-pld-linux-gcc"
 # force_cxx            - force using __cxx other than 
"%{_target_cpu}-pld-linux-g++"
@@ -34,7 +32,7 @@
 Name:          rpm
 %define        sover   4.4
 Version:       4.4.2
-Release:       3.1
+Release:       4
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -1110,6 +1108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.107  2005/09/03 18:10:22  arekm
+- rel 4; use patched system libmagic
+
 Revision 1.555.2.106  2005/09/03 14:57:44  arekm
 - nicer way of handling libmagic bcond in build
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to