From 883afd1e1756bcaf42ba285e81397b55277993c6 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mar 27 2014 09:06:55 +0000 Subject: - revert #1045723 fix for now, it breaks some java package macros --- diff --git a/rpm.spec b/rpm.spec index 7e31a7b..a995aad 100644 --- a/rpm.spec +++ b/rpm.spec @@ -22,7 +22,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}3%{?dist} +Release: %{?snapver:0.%{snapver}.}4%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2 @@ -264,7 +264,7 @@ packages on a system. %patch100 -p1 -b .filter-soname-deps %patch101 -p1 -b .dont-filter-ld64 -%patch102 -p1 -b .macro-newlines +#patch102 -p1 -b .macro-newlines %patch103 -p1 -b .reset-fileactions %patch104 -p1 -b .python3-buildsign @@ -525,6 +525,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Thu Mar 27 2014 Panu Matilainen - 4.11.2-4 +- revert #1045723 fix for now, it breaks some java package macros + * Wed Mar 26 2014 Panu Matilainen - 4.11.2-3 - dont eat newlines on parametrized macro invocations (#1045723) - fully reset file actions between rpmtsRun() calls (#1076552)