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

added vendor ROSA patch

Browse source
This commit is contained in:
root 2012-05-03 18:54:08 +04:00
parent 50e180a74f
commit 7e605b2020
2 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
rpm-5.3.12.vendor.ROSA.patch Normal file
View file

@ -0,0 +1,55 @@
diff -Nur rpm-5.3.12/macros/macros rpm-5.3.12.new/macros/macros
--- rpm-5.3.12/macros/macros 2011-07-12 14:08:41.000000000 +0400
+++ rpm-5.3.12.new/macros/macros 2012-04-10 14:42:44.000000000 +0400
@@ -835,7 +835,7 @@
#
%_arch x86_64
%_build_arch x86_64
-%_vendor mandriva
+%_vendor rosa
%_os linux
%_gnu -gnu
diff -Nur rpm-5.3.12/macros/mandriva rpm-5.3.12.new/macros/mandriva
--- rpm-5.3.12/macros/mandriva 2011-07-12 14:08:41.000000000 +0400
+++ rpm-5.3.12.new/macros/mandriva 2012-04-10 14:44:02.000000000 +0400
@@ -1,7 +1,7 @@
%distribution Mandriva Linux
%vendor Mandriva
-%bugurl http://qa.mandriva.com
-%disturl http://mandriva.org
+%bugurl http://bugs.rosalinux.ru/
+%disturl http://www.rosalab.ru/
# This macro will disable the transaction lock on /var/lib/rpm/__db.*.
# This lock is of no use to us and will also result in errors when trying to
diff -Nur rpm-5.3.12/macros/mandriva.in rpm-5.3.12.new/macros/mandriva.in
--- rpm-5.3.12/macros/mandriva.in 2011-05-04 16:20:06.000000000 +0400
+++ rpm-5.3.12.new/macros/mandriva.in 2012-04-10 14:46:12.000000000 +0400
@@ -1,7 +1,7 @@
-%distribution Mandriva Linux
-%vendor Mandriva
-%bugurl http://qa.mandriva.com
-%disturl http://mandriva.org
+%distribution ROSA Linux
+%vendor ROSA
+%bugurl http://bugs.rosalinux.ru/
+%disturl http://www.rosalab.ru/
# This macro will disable the transaction lock on /var/lib/rpm/__db.*.
# This lock is of no use to us and will also result in errors when trying to
diff -Nur rpm-5.3.12/macros/openmamba rpm-5.3.12.new/macros/openmamba
--- rpm-5.3.12/macros/openmamba 2011-07-12 14:08:41.000000000 +0400
+++ rpm-5.3.12.new/macros/openmamba 2012-04-10 14:45:46.000000000 +0400
@@ -1,7 +1,7 @@
-%distribution mandriva Linux
-%vendor mandriva
-%bugurl http://bugs.mandriva.org
-%disturl http://mandriva.org
+%distribution rosa Linux
+%vendor rosa
+%bugurl http://bugs.rosalinux.ru/
+%disturl http://www.rosalab.ru/
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}

3
rpm.spec
View file

@ -52,7 +52,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}4
Release: %{?prereldate:0.%{prereldate}.}5
Epoch: 1
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -94,6 +94,7 @@ Patch21: rpm-5.3.12-change-dep-loop-errors-to-warnings.patch
Patch22: rpm-5.3.12-55810-rpmevrcmp-again-grf.patch
Patch23: rpm-5.3.12-fix-verify-segfault.patch
Patch24: rpm-5.3.12-cve-2012-0815,0060,0061.patch
Patch25: rpm-5.3.12.vendor.ROSA.patch
License: LGPLv2.1+
BuildRequires: autoconf >= 2.57 bzip2-devel automake >= 1.8 elfutils-devel