SPECS (AC-branch): rpm.spec - (partial) merge from HEAD to rpm 4.4.2
arekm
arekm at pld-linux.org
Mon Aug 15 20:30:29 CEST 2005
Author: arekm Date: Mon Aug 15 18:30:28 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- (partial) merge from HEAD to rpm 4.4.2
---- Files affected:
SPECS:
rpm.spec (1.555.2.93 -> 1.555.2.94)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.93 SPECS/rpm.spec:1.555.2.94
--- SPECS/rpm.spec:1.555.2.93 Tue Aug 2 11:30:26 2005
+++ SPECS/rpm.spec Mon Aug 15 20:30:22 2005
@@ -20,7 +20,7 @@
# versions of required libraries
%define reqdb_ver 4.2.52-10
-%define reqpopt_ver 1.10.1
+%define reqpopt_ver 1.10.2
%define beecrypt_ver 2:4.1.2-4
%define rpm_macros_rev 1.231
Summary: RPM Package Manager
@@ -32,12 +32,12 @@
Summary(uk): íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
Name: rpm
%define sover 4.4
-Version: 4.4.1
-Release: 9
+Version: 4.4.2
+Release: 0.1
License: GPL
Group: Base
Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5: 90ded9047b1b69d918c6c7c7b56fd7a9
+# Source0-md5: e24ce468082479fe850c9d6563f56db5
Source1: %{name}.groups
Source2: %{name}.platform
Source3: %{name}-install-tree
@@ -76,7 +76,7 @@
Patch16: %{name}-php-deps.patch
Patch17: %{name}-ldconfig-always.patch
Patch18: %{name}-perl_req.patch
-Patch19: %{name}-no-bin-env.patch
+
Patch20: %{name}-magic-usesystem.patch
Patch21: %{name}-dontneedutils.patch
Patch22: %{name}-provides-dont-obsolete.patch
@@ -95,7 +95,7 @@
Patch35: %{name}-perl_req-INC_dirs.patch
Patch36: %{name}-debuginfo.patch
Patch37: %{name}-doxygen_hack.patch
-Patch38: %{name}-gcc4.patch
+
Patch39: %{name}-pythondeps.patch
Patch40: %{name}-print-requires.patch
Patch41: %{name}-reduce-stack-usage.patch
@@ -103,8 +103,8 @@
Patch43: %{name}-patch-quote.patch
Patch44: %{name}-no-neon.patch
Patch45: %{name}-no-sqlite.patch
-Patch46: %{name}-file-update.patch
-URL: http://www.rpm.org/
+Patch46: %{name}-mono.patch
+URL: http://wraptastic.org/
Icon: rpm.gif
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -127,8 +127,8 @@
%endif
BuildRequires: patch >= 2.2
BuildRequires: popt-devel >= %{reqpopt_ver}
-%{?with_python:BuildRequires: python-devel >= 2.2}
-BuildRequires: python-modules >= 2.2
+%{?with_python:BuildRequires: python-devel >= 1:2.3}
+BuildRequires: python-modules >= 1:2.3
BuildRequires: readline-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
@@ -432,6 +432,7 @@
Requires: tar
Requires: textutils
Provides: rpmbuild(macros) = %{rpm_macros_rev}
+Provides: rpmbuild(monoautodeps)
Provides: rpmbuild(noauto) = 3
%ifarch %{x8664}
Conflicts: automake < 1:1.7.9-2
@@ -609,7 +610,6 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
cp -f platform.in macros.pld.in
echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -617,6 +617,8 @@
echo '# obsoleted file' > macros.python
echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php
echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php
+echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono
+echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono
install %{SOURCE5} scripts/find-lang.sh
install %{SOURCE9} scripts/php.prov.in
install %{SOURCE10} scripts/php.req.in
@@ -640,7 +642,6 @@
%patch35 -p0
%patch36 -p1
%patch37 -p1
-%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch41 -p1
@@ -652,7 +653,7 @@
%patch0 -p1
%patch3 -p1
-cd scripts;
+cd scripts
mv -f perl.req perl.req.in
mv -f perl.prov perl.prov.in
cd ..
@@ -737,6 +738,7 @@
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
+install macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
install %{SOURCE1} doc/manual/groups
install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -1035,6 +1037,7 @@
%{_rpmlibdir}/sparc*
%endif
# must be here for "Requires: rpm-*prov" to work
+%{_rpmlibdir}/macros.mono
%{_rpmlibdir}/macros.perl
%{_rpmlibdir}/macros.php
# not used yet ... these six depend on perl
@@ -1085,11 +1088,8 @@
%if %{with python}
%files -n python-rpm
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
%attr(755,root,root) %{py_sitedir}/rpm/*.so
%attr(755,root,root) %{py_sitedir}/rpm/*.py[co]
-%attr(755,root,root) %{py_sitedir}/rpmdb/*.so
-%{py_sitedir}/rpmdb/*.py*
%endif
%if %{with apidocs}
@@ -1104,6 +1104,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.555.2.94 2005/08/15 18:30:22 arekm
+- (partial) merge from HEAD to rpm 4.4.2
+
Revision 1.555.2.93 2005/08/02 09:30:26 charles
- pythondeps.sh (-pythonprov) req. python-modules
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.93&r2=1.555.2.94&f=u
More information about the pld-cvs-commit
mailing list