mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
LOG Add rpm-5.4.9-package-name.patch to restore RPM_PACKAGE_NAME export which is still used by aot-compile-rpm
This commit is contained in:
parent
7f5a816512
commit
a717a5b6fd
2 changed files with 20 additions and 3 deletions
13
rpm-5.4.9-package-name.patch
Normal file
13
rpm-5.4.9-package-name.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff -urN rpm-5.4.9/macros/macros.rpmbuild.in rpm-5.4.9-patched/macros/macros.rpmbuild.in
|
||||
--- rpm-5.4.9/macros/macros.rpmbuild.in 2012-08-25 12:37:14.939808237 +1100
|
||||
+++ rpm-5.4.9-patched/macros/macros.rpmbuild.in 2012-08-25 12:36:37.302808636 +1100
|
||||
@@ -303,7 +303,8 @@
|
||||
%___build_pre \
|
||||
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
|
||||
RPM_OPT_FLAGS=\"%{optflags}\"\
|
||||
- export RPM_BUILD_DIR RPM_OPT_FLAGS\
|
||||
+ RPM_PACKAGE_NAME=\"%{name}\"\
|
||||
+ export RPM_BUILD_DIR RPM_OPT_FLAGS RPM_PACKAGE_NAME\
|
||||
%{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
|
||||
export RPM_BUILD_ROOT}\
|
||||
%{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
|
10
rpm.spec
10
rpm.spec
|
@ -61,7 +61,7 @@ Name: rpm
|
|||
Epoch: 1
|
||||
Version: %{libver}.%{minorver}
|
||||
License: LGPLv2.1+
|
||||
Release: 7
|
||||
Release: 8
|
||||
Group: System/Configuration/Packaging
|
||||
URL: http://rpm5.org/
|
||||
# snapshot from rpm-5_4 branch: 'cvs -d :pserver:anonymous@rpm5.org:/cvs co -r rpm-5_4 rpm'
|
||||
|
@ -362,9 +362,12 @@ Patch157: rpm-5.4.9-merge-rpm.org-and-mandriva-perl-dep-gen-changes.patch
|
|||
# code and don't want to spend more time just to get the API..
|
||||
Patch158: rpm-5.4.9-fix-neon-saving-error-pages-as-target-file.patch
|
||||
|
||||
#ROSA stuff. Disable internal dependences generator
|
||||
# ROSA stuff
|
||||
# Disable internal dependences generator
|
||||
Patch500: rpm-5.4.9-disable_internal_dependency_generator.patch
|
||||
Patch501: rpm-5.3.12.vendor.ROSA.patch
|
||||
Patch501: rpm-5.3.12.vendor.ROSA.patch
|
||||
# Restore RPM_PACKAGE_NAME export as it's still used by aot-compile-rpm
|
||||
Patch502: rpm-5.4.9-package-name.patch
|
||||
|
||||
BuildRequires: autoconf >= 2.57
|
||||
BuildRequires: bzip2-devel
|
||||
|
@ -731,6 +734,7 @@ This package contains the RPM API documentation generated in HTML format.
|
|||
|
||||
#patch500 -p1 -b .disabledep
|
||||
%patch501 -p1 -b .rosa_vendor~
|
||||
%patch502 -p1 -b .package_name~
|
||||
|
||||
#required by P55, P80, P81, P94..
|
||||
./autogen.sh
|
||||
|
|
Loading…
Add table
Reference in a new issue