]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- sane default patch flags
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 4 Dec 2020 22:08:23 +0000 (23:08 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 4 Dec 2020 22:08:23 +0000 (23:08 +0100)
default-patch-flags.patch [new file with mode: 0644]
rpm.spec

diff --git a/default-patch-flags.patch b/default-patch-flags.patch
new file mode 100644 (file)
index 0000000..df4b8a8
--- /dev/null
@@ -0,0 +1,12 @@
+--- rpm-4.16.0/macros.in~      2020-11-22 20:06:30.000000000 +0100
++++ rpm-4.16.0/macros.in       2020-12-04 23:07:19.298019290 +0100
+@@ -419,8 +419,7 @@
+ %_default_patch_fuzz  0
+ #     Default patch flags
+-#%_default_patch_flags        -s
+-%_default_patch_flags --no-backup-if-mismatch
++%_default_patch_flags -s
+ #==============================================================================
+ # ---- Build configuration macros.
index d42dfa95f024acb5f876857fa056b571f088e844..89e83563883ebbe5d0e3e676ea027b98f868b78e 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.16.0
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.16.0
-Release:       0.9
+Release:       0.10
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -78,6 +78,7 @@ Patch24:      cpuinfo-deps.patch
 Patch25:       rpmio-read-proc-files.patch
 Patch26:       allow-at-in-ver-rel.patch
 Patch27:       no-exeonly-for-elf-reqprov.patch
 Patch25:       rpmio-read-proc-files.patch
 Patch26:       allow-at-in-ver-rel.patch
 Patch27:       no-exeonly-for-elf-reqprov.patch
+Patch28:       default-patch-flags.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
@@ -571,6 +572,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
 
 install %{SOURCE15} scripts/perl.prov.in
 
This page took 0.088043 seconds and 4 git commands to generate.