[packages/rpm] - pattern_Release cannot be overriden, change it in main macro file

baggins baggins at pld-linux.org
Fri Sep 14 14:18:02 CEST 2012


commit e94735a58a6fcbe63431319d50aaba90defb0b26
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 14 14:17:27 2012 +0200

    - pattern_Release cannot be overriden, change it in main macro file

 macros.pld.in             |  3 ---
 rpm-pattern_Release.patch | 11 +++++++++++
 rpm.spec                  |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 3cad278..7c5cb4f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -125,6 +125,7 @@ Patch41:	%{name}-fix-missing-types-in-headers.patch
 Patch42:	%{name}-disable-ldconfig-optimization.patch
 Patch43:	%{name}-fix--p-interpreter-and-empty-script.patch
 Patch44:	%{name}-db_buffer_small.patch
+Patch45:	%{name}-pattern_Release.patch
 
 # Patches imported from Mandriva
 
@@ -790,6 +791,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 #patch42 -p1
 %patch43 -p1
 %patch44 -p1
+%patch45 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/macros.pld.in b/macros.pld.in
index 6d12784..d28e71a 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -114,9 +114,6 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 # provides don't obsolete
 %_upgrade_tag		name
 
-# we use '@' in release for kernel packages
-%pattern_Release	^[A-Za-z0-9+._@]+$
-
 # Do not generate executable() dependencies for scriptlets,
 # as it may give false positives, for example:
 # [ ! -x /bin/prog ] || /bin/prog
diff --git a/rpm-pattern_Release.patch b/rpm-pattern_Release.patch
new file mode 100644
index 0000000..f78e9b0
--- /dev/null
+++ b/rpm-pattern_Release.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/macros/macros.in~	2012-09-12 13:52:19.305575500 +0200
++++ rpm-5.4.10/macros/macros.in	2012-09-14 14:15:34.115044785 +0200
+@@ -778,7 +778,7 @@
+ %pattern_Name		^[A-Za-z0-9][A-Za-z0-9+._-]*$
+ %pattern_Epoch		^[0-9]+$
+ %pattern_Version	^[A-Za-z0-9+._~]+$
+-%pattern_Release	^[A-Za-z0-9+._]+$
++%pattern_Release	^[A-Za-z0-9+._@{}%]+$
+ %pattern_Disttag	^[A-Za-z0-9]+$
+ %pattern_Repotag	^[A-Za-z0-9]+$
+ %pattern_Distepoch	^[A-Za-z0-9.]+$
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/e94735a58a6fcbe63431319d50aaba90defb0b26



More information about the pld-cvs-commit mailing list