Author: glen                         Date: Thu Sep  4 17:19:19 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- neon patch updated, disable neon; rel 0.55

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.21 -> 1.837.2.42.2.49.2.22) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.21 SPECS/rpm.spec:1.837.2.42.2.49.2.22
--- SPECS/rpm.spec:1.837.2.42.2.49.2.21 Wed Sep  3 18:48:15 2008
+++ SPECS/rpm.spec      Thu Sep  4 19:19:13 2008
@@ -10,7 +10,6 @@
 #   preserving payload format and compressor from original rpm, _not_ current 
settings
 #   /usr/bin/install: cannot stat `./it.gmo': No such file or directory
 #   /usr/bin/install: cannot stat `./[EMAIL PROTECTED]': No such file or 
directory
-# - neon makes rpm link to libs in /usr
 #
 # Conditional build:
 %bcond_with    static          # build static rpm+rpmi
@@ -28,7 +27,7 @@
 %bcond_without selinux         # build without selinux support
 %bcond_without system_libmagic # don't use system libmagic
 %bcond_without suggest_tags    # build without Suggest tag (bootstrapping)
-%bcond_without neon            # build with HTTP/WebDAV support (neon library)
+%bcond_with    neon            # build with HTTP/WebDAV support (neon 
library). NOTE: neon libs are in /usr!
 # force_cc             - force using __cc other than 
"%{_target_cpu}-pld-linux-gcc"
 # force_cxx            - force using __cxx other than 
"%{_target_cpu}-pld-linux-g++"
 # force_cpp            - force using __cpp other than 
"%{_target_cpu}-pld-linux-gcc -E"
@@ -51,7 +50,7 @@
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       0.54
+Release:       0.55
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -698,7 +697,7 @@
 %patch39 -p1
 %patch42 -p1
 %patch43 -p1
-## TODO %{!?with_neon:%patch44 -p1}
+%{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch48 -p1
 %patch50 -p1
@@ -1400,6 +1399,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.22  2008/09/04 17:19:13  glen
+- neon patch updated, disable neon; rel 0.55
+
 Revision 1.837.2.42.2.49.2.21  2008/09/03 16:48:15  glen
 - oops, rpm tarball already contains db dist, so only db4.5 is possible with 
internal db
 - however build still fails with it(some libtool problem?)
================================================================

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

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

Reply via email to