rdieter pushed to qt5-qtbase (f21). "Revert "drop bootstrap" (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 5 18:15:58 UTC 2015
>From 0ccf360336380d75225c41c240c1d7774ecce218 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 5 May 2015 13:11:36 -0500
Subject: Revert "drop bootstrap"
This reverts commit 99f62f4bf3f743c4689b69dde6a1c9630217812d.
Still broke, broke, looks like more love is needed to figure out
what's going on here
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 1d4303f..a209f1e 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -15,9 +15,9 @@
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
-#if 0%{?fedora} > 22
-#global bootstrap 1
-#endif
+%if 0%{?fedora} > 22
+%global bootstrap 1
+%endif
# define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available
@@ -37,7 +37,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.4.1
-Release: 13%{?dist}
+Release: 12%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -897,9 +897,6 @@ fi
%changelog
-* Sun May 03 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-13
-- drop bootstrap
-
* Fri May 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.1-12
- backport a couple more upstream fixes
- introduce -common noarch subpkg, should help multilib issues
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtbase.git/commit/?h=f21&id=0ccf360336380d75225c41c240c1d7774ecce218
More information about the scm-commits
mailing list