commit d5aba63e2543ea059e029e9cb12ec31bc8088a44
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Thu Nov 14 19:02:21 2024 +0100

    - conflicts with grantlee-qt6 (same file names); release 2

 grantlee-qt5.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/grantlee-qt5.spec b/grantlee-qt5.spec
index 791b8f3..b060427 100644
--- a/grantlee-qt5.spec
+++ b/grantlee-qt5.spec
@@ -8,7 +8,7 @@ Summary:        Grantlee - set of frameworks for use with Qt 5
 Summary(pl.UTF-8):     Grantlee - zbiór szkieletów do wykorzystania z Qt 5
 Name:          grantlee-qt5
 Version:       5.3.1
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       
https://github.com/steveire/grantlee/releases/download/v%{version}/grantlee-%{version}.tar.gz
@@ -32,6 +32,7 @@ BuildRequires:        rpmbuild(macros) >= 1.605
 Requires:      Qt5Core >= %{qt_ver}
 Requires:      Qt5Gui >= %{qt_ver}
 Requires:      Qt5Script >= %{qt_ver}
+Conflicts:     grantlee-qt6 < 6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,6 +52,7 @@ Requires:     Qt5Core-devel >= %{qt_ver}
 # only textdocument library
 Requires:      Qt5Gui-devel >= %{qt_ver}
 Conflicts:     grantlee-devel
+Conflicts:     grantlee-qt6-devel < 6
 
 %description devel
 Header files for grantlee libraries.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grantlee-qt5.git/commitdiff/d5aba63e2543ea059e029e9cb12ec31bc8088a44

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to