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

Merge branch 'red3' of https://abf.rosalinux.ru/import/rpm into red3

Browse source 
Conflicts:
	rpm.spec
This commit is contained in:
Denis Silakov 2014-01-15 03:12:06 -05:00
commit 6f73cb6c03
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpm-5.4.10.red3.hardcode.patch
View file

@ -8,7 +8,7 @@ diff -Nur rpm-5.4.10.old/macros/mandriva rpm-5.4.10/macros/mandriva
-%disttag %{!?distsuffix:mdv}%{?distsuffix}
-%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
+%disttag red
+%distepoch 3
+%distepoch 2
# Dynamic EVRD tags macro for use with versioned provides/requires in place of
# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present
@ -22,7 +22,7 @@ diff -Nur rpm-5.4.10.old/macros/mandriva.in rpm-5.4.10/macros/mandriva.in
-%disttag %{!?distsuffix:mdv}%{?distsuffix}
-%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
+%disttag red
+%distepoch 3
+%distepoch 2
# Dynamic EVRD tags macro for use with versioned provides/requires in place of
# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present

2
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}.}22
Release: %{?prereldate:0.%{prereldate}.}23
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/