[packages/grantlee-qt5] - grantlee updated to 5.0.0 for qt5

qboosh qboosh at pld-linux.org
Fri Dec 4 19:53:49 CET 2015


commit c24ff63cb1b01bbc25c167ffb98c5b0f7229f179
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 4 19:54:38 2015 +0100

    - grantlee updated to 5.0.0 for qt5

 grantlee-link.patch                | 10 ------
 grantlee.spec => grantlee-qt5.spec | 74 +++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 46 deletions(-)
---
diff --git a/grantlee.spec b/grantlee-qt5.spec
similarity index 52%
rename from grantlee.spec
rename to grantlee-qt5.spec
index 5354150..a927b03 100644
--- a/grantlee.spec
+++ b/grantlee-qt5.spec
@@ -1,32 +1,35 @@
-%define		qt_ver		4.7.1
-%define		major_ver	0.5
-
-Summary:	Grantlee - set of frameworks for use with Qt
-Summary(pl.UTF-8):	Grantlee - zbiór szkieletów do wykorzystania z Qt
-Name:		grantlee
-Version:	0.5.1
-Release:	3
+%define		qt_ver		5.2.0
+%define		major_ver	5.0
+
+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.0.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://downloads.grantlee.org/%{name}-%{version}.tar.gz
-# Source0-md5:	775f22dac0953029b414ed3b7379098c
-Patch0:		%{name}-link.patch
+Source0:	http://downloads.grantlee.org/grantlee-%{version}.tar.gz
+# Source0-md5:	feb7f82d08e046fe078ea475dee710f6
 URL:		http://www.gitorious.org/grantlee/pages/Home
-BuildRequires:	QtCore-devel >= %{qt_ver}
-BuildRequires:	QtGui-devel >= %{qt_ver}
-BuildRequires:	QtScript-devel >= %{qt_ver}
-BuildRequires:	QtSql-devel >= %{qt_ver}
-BuildRequires:	QtTest-devel >= %{qt_ver}
-BuildRequires:	QtWebKit-devel >= %{qt_ver}
-BuildRequires:	cmake >= 2.8.11
-BuildRequires:	qt4-build >= %{qt_ver}
-BuildRequires:	qt4-qmake >= %{qt_ver}
-BuildRequires:	qt4-linguist >= %{qt_ver}
+BuildRequires:	Qt5Core-devel >= %{qt_ver}
+BuildRequires:	Qt5Gui-devel >= %{qt_ver}
+BuildRequires:	Qt5Network-devel >= %{qt_ver}
+BuildRequires:	Qt5Script-devel >= %{qt_ver}
+BuildRequires:	Qt5Sql-devel >= %{qt_ver}
+BuildRequires:	Qt5Test-devel >= %{qt_ver}
+BuildRequires:	Qt5WebKit-devel >= %{qt_ver}
+BuildRequires:	Qt5Widgets-devel >= %{qt_ver}
+BuildRequires:	Qt5XmlPatterns-devel >= %{qt_ver}
+BuildRequires:	cmake >= 2.8.12
+BuildRequires:	qt5-build >= %{qt_ver}
+BuildRequires:	qt5-qmake >= %{qt_ver}
+BuildRequires:	qt5-linguist >= %{qt_ver}
 BuildRequires:	rpmbuild(macros) >= 1.605
+Requires:	Qt5Core >= %{qt_ver}
+Requires:	Qt5Gui >= %{qt_ver}
+Requires:	Qt5Script >= %{qt_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         filterout       -flto
-
 %description
 Grantlee is a string template engine based on the Django template
 system and written using Qt.
@@ -40,9 +43,10 @@ Summary:	Header files for grantlee libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek grantlee
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	QtCore-devel >= %{qt_ver}
-# only _gui (textdocument) library
-Requires:	QtGui-devel >= %{qt_ver}
+Requires:	Qt5Core-devel >= %{qt_ver}
+# only textdocument library
+Requires:	Qt5Gui-devel >= %{qt_ver}
+Conflicts:	grantlee-devel
 
 %description devel
 Header files for grantlee libraries.
@@ -51,8 +55,7 @@ Header files for grantlee libraries.
 Pliki nagłówkowe bibliotek grantlee.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n grantlee-%{version}
 
 %build
 install -d build
@@ -76,10 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG README
-%attr(755,root,root) %{_libdir}/libgrantlee_core.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrantlee_core.so.0
-%attr(755,root,root) %{_libdir}/libgrantlee_gui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrantlee_gui.so.0
+%attr(755,root,root) %{_libdir}/libGrantlee_Templates.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGrantlee_Templates.so.5
+%attr(755,root,root) %{_libdir}/libGrantlee_TextDocument.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGrantlee_TextDocument.so.5
 %dir %{_libdir}/grantlee
 %dir %{_libdir}/grantlee/%{major_ver}
 %attr(755,root,root) %{_libdir}/grantlee/%{major_ver}/grantlee_defaultfilters.so
@@ -89,10 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgrantlee_core.so
-%attr(755,root,root) %{_libdir}/libgrantlee_gui.so
-%{_includedir}/grantlee_core.h
+%attr(755,root,root) %{_libdir}/libGrantlee_Templates.so
+%attr(755,root,root) %{_libdir}/libGrantlee_TextDocument.so
 %{_includedir}/grantlee_templates.h
 %{_includedir}/grantlee_textdocument.h
 %{_includedir}/grantlee
-%{_libdir}/cmake/grantlee
+%{_libdir}/cmake/Grantlee5
diff --git a/grantlee-link.patch b/grantlee-link.patch
deleted file mode 100644
index 61d1fde..0000000
--- a/grantlee-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- grantlee-0.3.0/templates/tests/CMakeLists.txt.orig	2012-11-01 21:14:18.000000000 +0100
-+++ grantlee-0.3.0/templates/tests/CMakeLists.txt	2013-03-29 12:34:59.121030848 +0100
-@@ -101,6 +101,7 @@
-   testinternationalization
- #   benchmarks
- )
-+target_link_libraries(testgenerictypes_exec pthread)
- 
- add_subdirectory(pluginpointertest)
- 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list