[packages/qt5-qttools] - fix spec breakage

hawk hawk at pld-linux.org
Wed Jan 24 16:34:48 CET 2018


commit ac755bff62e56b5bba95828174e4a2b121323bea
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Wed Jan 24 15:33:52 2018 +0000

    - fix spec breakage

 qt5-qttools.spec | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b22199d..84560da 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -22,11 +22,7 @@ Summary:	Development tools for Qt 5
 Summary(pl.UTF-8):	Narzędzia programistyczne dla Qt 5
 Name:		qt5-%{orgname}
 Version:	5.8.0
-<<<<<<< Updated upstream
 Release:	1
-=======
-Release:	0.1
->>>>>>> Stashed changes
 License:	LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qttools.git/commitdiff/ac755bff62e56b5bba95828174e4a2b121323bea



More information about the pld-cvs-commit mailing list