RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 08-May-2012 02:44:04
Branch: rpm-5_4 Handle: 2012050800440301
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros mandriva.in
Log:
applied mdv patch rpm-5.4.5-enable-internal-dependency-generator.patch
Submitted by: mdawkins
Summary:
Revision Changes Path
1.3501.2.280+1 -0 rpm/CHANGES
1.7.2.16 +6 -1 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.279 -r1.3501.2.280 CHANGES
--- rpm/CHANGES 8 May 2012 00:38:11 -0000 1.3501.2.279
+++ rpm/CHANGES 8 May 2012 00:44:03 -0000 1.3501.2.280
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+ - mdawkins: applied mdv patch
rpm-5.4.5-enable-internal-dependency-generator.patch
- mdawkins: applied mdv patch rpm-5.4.4-fix-_sys_macros_dir-path.patch
- mdawkins: applied mdv patch
rpm-5.4.4-merge-rpm-mandriva-setup-build-macros.patch
- mdawkins: applied mdv patch
rpm-5.4.4-merge-common-rpm-mandriva-setup-macros.patch
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.7.2.15 -r1.7.2.16 mandriva.in
--- rpm/macros/mandriva.in 8 May 2012 00:38:12 -0000 1.7.2.15
+++ rpm/macros/mandriva.in 8 May 2012 00:44:04 -0000 1.7.2.16
@@ -268,7 +268,12 @@
#%__check_multiarch_files @USRLIBRPM@/check-multiarch-files %{buildroot}
# Use internal dependency generator rather than external helpers?
-%_use_internal_dependency_generator 0
+%_use_internal_dependency_generator 1
+# TODO: merge relevant changes into rpm version rather than using our own
+%__perl_provides @USRLIBRPM@/@RPMCANONVENDOR@/perl.prov
+%__perl_requires @USRLIBRPM@/@RPMCANONVENDOR@/perl.req
+%__php_provides
@USRLIBRPM@/@RPMCANONVENDOR@/php.prov
+%__php_requires
@USRLIBRPM@/@RPMCANONVENDOR@/php.req
%__find_provides @USRLIBRPM@/@RPMCANONVENDOR@/filter.sh
'%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }'
'%{?_exclude_files_from_autoprov:%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov:
}' '%{buildroot}' @USRLIBRPM@/@RPMCANONVENDOR@/find-provides
%__find_requires @USRLIBRPM@/@RPMCANONVENDOR@/filter.sh
'%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }'
'%{?_exclude_files_from_autoreq:%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq:
}' '%{buildroot}' @USRLIBRPM@/@RPMCANONVENDOR@/find-requires
%{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
