SPECS (AC-branch): rpm.spec - changelog truncation patch - adapterize

[glen]

Author: glen                         Date: Wed Apr 26 19:53:59 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- changelog truncation patch
- adapterize

---- Files affected:
SPECS:
   rpm.spec (1.555.2.169 -> 1.555.2.170) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.169 SPECS/rpm.spec:1.555.2.170
--- SPECS/rpm.spec:1.555.2.169	Wed Apr 12 15:59:48 2006
+++ SPECS/rpm.spec	Wed Apr 26 21:53:53 2006
@@ -23,6 +23,7 @@
 %define	reqdb_ver	4.2.52-10
 %define	reqpopt_ver	1.10.2
 %define	beecrypt_ver	2:4.1.2-4
+%define	sover	4.4
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -31,9 +32,8 @@
 Summary(ru):	íĹÎĹÄÖĹŇ ĐÁËĹÔĎ× ĎÔ RPM
 Summary(uk):	íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
 Name:		rpm
-%define	sover	4.4
 Version:	4.4.2
-Release:	31
+Release:	31.44
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -111,6 +111,7 @@
 Patch51:	%{name}-cleanlibdirs.patch
 Patch52:	%{name}-dep_whiteout.patch
 Patch53:	%{name}-doxygen_no_file.patch
+Patch54:	%{name}-truncate-cvslog.patch
 URL:		http://wraptastic.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -119,7 +120,6 @@
 BuildRequires:	db-devel >= %{reqdb_ver}
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	elfutils-devel >= 0.108
-BuildRequires:	findutils
 BuildRequires:	gettext-devel >= 0.11.4-2
 %{?with_system_libmagic:BuildRequires:	libmagic-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
@@ -143,17 +143,17 @@
 BuildRequires:	beecrypt-static >= %{beecrypt_ver}
 BuildRequires:	bzip2-static >= 1.0.2-17
 BuildRequires:	db-static >= %{reqdb_ver}
-BuildRequires:	glibc-static >= 2.2.94
 BuildRequires:	elfutils-static
+BuildRequires:	glibc-static >= 2.2.94
 %{?with_system_libmagic:BuildRequires:	libmagic-static}
 %{?with_selinux:BuildRequires:	libselinux-static >= 1.18}
 BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static
 %endif
-Requires:	beecrypt >= %{beecrypt_ver}
-Requires:	popt >= %{reqpopt_ver}
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
+Requires:	beecrypt >= %{beecrypt_ver}
+Requires:	popt >= %{reqpopt_ver}
 %{!?with_static:Obsoletes:	rpm-utils-static}
 Conflicts:	glibc < 2.2.92
 # avoid SEGV caused by mixed db versions
@@ -276,8 +276,8 @@
 Requires:	bzip2-devel
 Requires:	db-devel >= %{reqdb_ver}
 Requires:	elfutils-devel
-%{?with_selinux:Requires:	libselinux-devel}
 %{?with_system_libmagic:Requires:	libmagic-devel}
+%{?with_selinux:Requires:	libselinux-devel}
 Requires:	popt-devel >= %{reqpopt_ver}
 Requires:	zlib-devel
 
@@ -609,15 +609,15 @@
 %package apidocs
 Summary:	RPM API documentation and guides
 Summary(pl):	Documentacja API RPM-a i przewodniki
-Group:		Documentation	
+Group:		Documentation
 
 %description apidocs
-Documentation for RPM API and guides in HTML format generated
-from rpm sources by doxygen.
+Documentation for RPM API and guides in HTML format generated from rpm
+sources by doxygen.
 
 %description apidocs -l pl
-Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane
-ze źrodeł RPM-a przez doxygen.
+Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
+źrodeł RPM-a przez doxygen.
 
 %prep
 %setup -q
@@ -691,6 +691,7 @@
 rm -rf file
 %patch53 -p1
 %endif
+%patch54 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -826,8 +827,8 @@
 EOF
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles <<EOF
 # global list of files (regexps) which don't generate Requires
-^/usr/src/examples/
-^/usr/share/doc/
+^%{_examplesdir}/
+^%{_docdir}/
 EOF
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq <<EOF
 # global list of script capabilities (regexps) not to be used in Requires
@@ -1160,6 +1161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.170  2006/04/26 19:53:53  glen
+- changelog truncation patch
+- adapterize
+
 Revision 1.555.2.169  2006/04/12 13:59:48  glen
 - nscd cache invalidation for %userremove/%groupremove, rel 31
 
================================================================

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