SPECS (rpm-4_5): rpm.spec - internal db build fixes

[glen]

Author: glen                         Date: Wed Sep  3 14:52:40 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- internal db build fixes

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.17 -> 1.837.2.42.2.49.2.18) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.17 SPECS/rpm.spec:1.837.2.42.2.49.2.18
--- SPECS/rpm.spec:1.837.2.42.2.49.2.17	Wed Sep  3 16:44:28 2008
+++ SPECS/rpm.spec	Wed Sep  3 16:52:35 2008
@@ -10,6 +10,7 @@
 #   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 `./sr at Latn.gmo': No such file or directory
+# - neon makes rpm link to libs in /usr
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
@@ -50,7 +51,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	0.53
+Release:	0.54
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -659,9 +660,9 @@
 %setup -q
 %if %{with internal_db}
 %if "%{pld_release}" == "th"
-%{__tar} -zxf %{SOURCE20} -C db3 --strip-components=1
+%{__tar} -zxf %{SOURCE20} -C db --strip-components=1
 %else
-%{__tar} -zxf %{SOURCE19} -C db3 --strip-components=1
+%{__tar} -zxf %{SOURCE19} -C db --strip-components=1
 %endif
 %endif
 #%patch0 -p1
@@ -738,18 +739,21 @@
 %patch73 -p1
 %patch74 -p1
 %patch75 -p0
+%if "%{pld_release}" == "ac"
 %patch76 -p1
+%endif
 %patch77 -p0
 
 mv -f po/{sr,sr at Latn}.po
 rm -rf sqlite zlib popt rpmdb/db.h
+
 %if %{with internal_db}
-cd db3
+cd db
 %patchset_patch 1 %{reqdb_patch}
 %if "%{reqdb_ver}" == "4.5.20"
 %patch78 -p1
-cd -
 %endif
+cd -
 %else
 %patch15 -p1
 rm -rf db3 db
@@ -1389,6 +1393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.18  2008/09/03 14:52:35  glen
+- internal db build fixes
+
 Revision 1.837.2.42.2.49.2.17  2008/09/03 14:44:28  glen
 - deem. need different sources for db due md5
 
================================================================

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