than pushed to qt (f21). "macros.qt4: fix _qt4_evr macro (missing : after epoch)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 14:49:19 UTC 2015


>From 49c310bbc0afa4e5fae0ba752d4b58eeb4e30dd5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Mar 2015 08:06:45 -0500
Subject: macros.qt4: fix _qt4_evr macro (missing : after epoch)


diff --git a/qt.spec b/qt.spec
index f499787..72c5047 100644
--- a/qt.spec
+++ b/qt.spec
@@ -35,7 +35,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.6
-Release: 25%{?dist}
+Release: 26%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -898,7 +898,7 @@ sed -i \
   -e "s|@@NAME@@|%{name}|g" \
   -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
   -e "s|@@VERSION@@|%{version}|g" \
-  -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
+  -e "s|@@EVR@@|%{?epoch:%{epoch}:}%{version}-%{release}|g" \
   %{buildroot}%{rpm_macros_dir}/macros.qt4
 
 # create/own stuff under %%_qt4_docdir
@@ -1317,6 +1317,9 @@ fi
 
 
 %changelog
+* Fri Mar 20 2015 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.6-26
+- macros.qt4: fix _qt4_evr macro (missing : after epoch)
+
 * Fri Feb 27 2015 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.6-25
 - DoS vulnerability in the BMP image handler (CVE-2015-0295)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt.git/commit/?h=f21&id=49c310bbc0afa4e5fae0ba752d4b58eeb4e30dd5


More information about the scm-commits mailing list