Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hardcode red3

Browse source
This commit is contained in:
Alex Burmashev 2013-11-22 18:57:17 +04:00
parent 07b6050d19
commit 8159dcc098
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rpm-5.4.10.red3.hardcode.patch Normal file
View file

@ -0,0 +1,28 @@
diff -Nur rpm-5.4.10.old/macros/mandriva rpm-5.4.10/macros/mandriva
--- rpm-5.4.10.old/macros/mandriva 2013-11-22 18:50:06.000000000 +0400
+++ rpm-5.4.10/macros/mandriva 2013-11-22 18:52:32.396164469 +0400
@@ -43,8 +43,8 @@
# %release with such.
%evr_tuple_select 1234
%evr_tuple_order EVRD
-%disttag %{!?distsuffix:mdv}%{?distsuffix}
-%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
+%disttag red
+%distepoch 3
# Dynamic EVRD tags macro for use with versioned provides/requires in place of
# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present
diff -Nur rpm-5.4.10.old/macros/mandriva.in rpm-5.4.10/macros/mandriva.in
--- rpm-5.4.10.old/macros/mandriva.in 2013-11-22 18:50:06.000000000 +0400
+++ rpm-5.4.10/macros/mandriva.in 2013-11-22 18:52:46.059164876 +0400
@@ -43,8 +43,8 @@
# %release with such.
%evr_tuple_select 1234
%evr_tuple_order EVRD
-%disttag %{!?distsuffix:mdv}%{?distsuffix}
-%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
+%disttag red
+%distepoch 3
# Dynamic EVRD tags macro for use with versioned provides/requires in place of
# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present

7
rpm.spec
View file

@ -59,7 +59,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}18
Release: %{?prereldate:0.%{prereldate}.}19
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -408,6 +408,10 @@ Patch504: rpm-5.4.10-postpone_subpackage_build_failures.patch
# the new one doesn't work in ROSA atm
Patch505: rpm-5.4.10-turn-back-urlgetfile.patch
#Do not forget to replace hardcode with a proper macro"
Patch506: rpm-5.4.10.red3.hardcode.patch
BuildRequires: autoconf >= 2.57
BuildRequires: bzip2-devel
BuildRequires: automake >= 1.8
@ -794,6 +798,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch503 -p1 -b .specspo~
%patch504 -p1 -b .postpone_errors~
%patch505 -p1 -b .urlgetfile~
%patch506 -p1 -b .red3hardcode
#required by P55, P80, P81, P94..
./autogen.sh