Author: qboosh Date: Sun Apr 8 23:04:26 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- started update to 4.4.8
- updated pl.po,rpmrc,rpmpopt,compress-doc,etc_dir,system_libs-more,php-deps,
link,magic-usesystem,po,pld-autodep,doxygen_hack,reduce-stack-usage,no-neon,
mono,macros,libtool-deps,iconv-translit patches
- removed obsolete examplesaredoc,getcwd,libdir64,libdir-links,pythondeps,
vendor,patch-quote,requireseq,lzma,lzma2,skip-backups,CVE-2006-5466,
build-failure-error,mcontext,FileDigestParametrized,lua_linking patches
- added pkgconfigdeps patch
---- Files affected:
SPECS:
rpm.spec (1.797 -> 1.798)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.797 SPECS/rpm.spec:1.798
--- SPECS/rpm.spec:1.797 Sun Mar 11 14:32:52 2007
+++ SPECS/rpm.spec Mon Apr 9 01:04:20 2007
@@ -1,8 +1,8 @@
# $Revision$, $Date$
#
# 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)
+# - python(abi) cap is not provided automatically because
/usr/lib*/libpython2*.so.*
+# matches ELF first
# - repackaging when lzma is not installed (todo: fix digest signature of
header)
# rpmbuild computes digest when writing package to temporary file, then adds
a few
# tags (incl. digest) and writes whole package to destination file;
@@ -22,8 +22,8 @@
# force_cpp - force using __cpp other than
"%{_target_cpu}-pld-linux-gcc -E"
# versions of required libraries
-%define reqdb_ver 4.4.20
-%define reqpopt_ver 1.10.6
+%define reqdb_ver 4.5.20
+%define reqpopt_ver 1.10.8
%define beecrypt_ver 2:4.1.2-4
%define sover 4.4
Summary: RPM Package Manager
@@ -34,12 +34,12 @@
Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
-Version: 4.4.7
-Release: 13
+Version: 4.4.8
+Release: 0.1
License: GPL
Group: Base
Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5: d012c81b5169f7377ea4a36607e1445e
+# Source0-md5: dc73bcebf6b206058457c9a90f944c55
Source1: %{name}.groups
Source2: %{name}.platform
Source3: %{name}-install-tree
@@ -82,14 +82,13 @@
Patch20: %{name}-magic-usesystem.patch
Patch21: %{name}-dontneedutils.patch
Patch22: %{name}-provides-dont-obsolete.patch
-Patch23: %{name}-examplesaredoc.patch
+Patch23: %{name}-pkgconfigdeps.patch
Patch24: %{name}-po.patch
-Patch25: %{name}-getcwd.patch
+
Patch26: %{name}-notsc.patch
Patch27: %{name}-hack-norpmlibdep.patch
Patch28: %{name}-makefile-no_myLDADD_deps.patch
-Patch29: %{name}-libdir64.patch
-Patch30: %{name}-libdir-links.patch
+
Patch31: %{name}-missing-prototypes.patch
Patch32: %{name}-pld-autodep.patch
Patch33: %{name}-arch-x86_64.patch
@@ -98,36 +97,29 @@
Patch36: %{name}-debuginfo.patch
Patch37: %{name}-doxygen_hack.patch
Patch38: %{name}-empty-rpmlock-path.patch
-Patch39: %{name}-pythondeps.patch
-Patch40: %{name}-vendor.patch
+
Patch41: %{name}-reduce-stack-usage.patch
Patch42: %{name}-old-fileconflicts-behaviour.patch
-Patch43: %{name}-patch-quote.patch
+
Patch44: %{name}-no-neon.patch
Patch45: %{name}-no-sqlite.patch
Patch46: %{name}-mono.patch
-Patch48: %{name}-requireseq.patch
Patch49: %{name}-p4.patch
Patch50: %{name}-macros.patch
Patch51: %{name}-cleanlibdirs.patch
Patch52: %{name}-morearchs.patch
-Patch53: %{name}-lzma.patch
-Patch54: %{name}-lzma2.patch
+
Patch55: %{name}-truncate-cvslog.patch
-Patch56: %{name}-skip-backups.patch
+
Patch57: %{name}-as_needed-fix.patch
Patch58: %{name}-repackage-wo-lzma.patch
Patch59: %{name}-libtool-deps.patch
-Patch60: %{name}-CVE-2006-5466.patch
-Patch61: %{name}-build-failure-error.patch
-Patch62: %{name}-mcontext.patch
-Patch63: %{name}-FileDigestParameterized.patch
+
Patch64: %{name}-iconv-translit.patch
-Patch65: %{name}-lua_linking.patch
URL: http://wraptastic.org/
BuildRequires: autoconf >= 2.57
-BuildRequires: automake
+BuildRequires: automake >= 1.4
BuildRequires: beecrypt-devel >= %{beecrypt_ver}
BuildRequires: bzip2-devel >= 1.0.2-17
BuildRequires: db-devel >= %{reqdb_ver}
@@ -672,12 +664,9 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
-%patch29 -p1
-%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
@@ -686,32 +675,20 @@
%patch36 -p1
%patch37 -p1
%patch38 -p1
-%patch39 -p1
-%patch40 -p0
%patch41 -p1
%patch42 -p1
-%patch43 -p1
%{!?with_neon:%patch44 -p1}
%patch45 -p1
%patch46 -p1
-%patch48 -p1
%patch49 -p1
%patch50 -p1
%patch51 -p1
#%patch52 -p1
-%patch53 -p1
-%patch54 -p1
%patch55 -p1
-%patch56 -p1
%patch57 -p1
%patch58 -p1
%patch59 -p1
-%patch60 -p0
-%patch61 -p0
-%patch62 -p1
-%patch63 -p0
%patch64 -p1
-%patch65 -p1
cd scripts
mv -f perl.req perl.req.in
@@ -808,6 +785,9 @@
rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
+# not installed since 4.4.8 (-tools-perl subpackage)
+install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir}
+
install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
install macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
@@ -952,6 +932,8 @@
rm -f
$RPM_BUILD_ROOT%{_rpmlibdir}/{Specfile.pm,cpanflute,cpanflute2,find-provides,find-requires,freshen.sh,http.req,magic.prov,magic.req,perldeps.pl,sql.prov,sql.req,tcl.req}
# wrong location, not used anyway
rm -f $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
+# manuals for utils dropped in 4.4.8 (?)
+#rm -f $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/{rpmcache,rpmgraph}.8
%find_lang %{name}
@@ -970,7 +952,7 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc RPM-PGP-KEY CHANGES manual/*
+%doc CHANGES CREDITS README wdj/JBJ-GPG-KEY manual/*
%attr(755,root,root) /bin/rpm
#%attr(755,root,root) %{_bindir}/rpmdb
@@ -1039,10 +1021,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/debugedit
%attr(755,root,root) %{_bindir}/rpm2cpio
-%attr(755,root,root) %{_bindir}/rpmcache
%attr(755,root,root) %{_bindir}/rpmdeps
-%attr(755,root,root) %{_bindir}/rpmdigest
-%attr(755,root,root) %{_bindir}/rpmgraph
%{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile}
%attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
@@ -1050,16 +1029,16 @@
%attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
%{_mandir}/man8/rpm2cpio.8*
%{_mandir}/man8/rpmdeps.8*
-%{_mandir}/man8/rpmcache.8*
-%{_mandir}/man8/rpmgraph.8*
+#%{_mandir}/man8/rpmcache.8*
+#%{_mandir}/man8/rpmgraph.8*
%lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
-%lang(ja) %{_mandir}/ja/man8/rpmcache.8*
-%lang(ja) %{_mandir}/ja/man8/rpmgraph.8*
+#%lang(ja) %{_mandir}/ja/man8/rpmcache.8*
+#%lang(ja) %{_mandir}/ja/man8/rpmgraph.8*
%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
%lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
-%lang(pl) %{_mandir}/pl/man8/rpmcache.8*
-%lang(pl) %{_mandir}/pl/man8/rpmgraph.8*
+#%lang(pl) %{_mandir}/pl/man8/rpmcache.8*
+#%lang(pl) %{_mandir}/pl/man8/rpmgraph.8*
%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
%files utils-perl
@@ -1131,9 +1110,7 @@
#%{_rpmlibdir}/sql.prov
#%{_rpmlibdir}/sql.req
#%{_rpmlibdir}/tcl.req
-%{_rpmlibdir}/trpm
-%attr(755,root,root) %{_bindir}/javadeps
%attr(755,root,root) %{_bindir}/gendiff
%attr(755,root,root) %{_bindir}/rpmbuild
@@ -1189,6 +1166,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.798 2007/04/08 23:04:20 qboosh
+- started update to 4.4.8
+- updated pl.po,rpmrc,rpmpopt,compress-doc,etc_dir,system_libs-more,php-deps,
+ link,magic-usesystem,po,pld-autodep,doxygen_hack,reduce-stack-usage,no-neon,
+ mono,macros,libtool-deps,iconv-translit patches
+- removed obsolete examplesaredoc,getcwd,libdir64,libdir-links,pythondeps,
+ vendor,patch-quote,requireseq,lzma,lzma2,skip-backups,CVE-2006-5466,
+ build-failure-error,mcontext,FileDigestParametrized,lua_linking patches
+- added pkgconfigdeps patch
+
Revision 1.797 2007/03/11 13:32:52 tommat
- added lua linking patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.797&r2=1.798&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
