[packages/kf5-khtml] - up to 5.4.0

arekm arekm at pld-linux.org
Tue Dec 9 23:50:38 CET 2014


commit 564b5134242f1e05f0976174e7b82c4e0d3fbfe9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Dec 9 23:50:34 2014 +0100

    - up to 5.4.0

 kf5-khtml.spec | 71 +++++++++++++++++++++++++---------------------------------
 1 file changed, 31 insertions(+), 40 deletions(-)
---
diff --git a/kf5-khtml.spec b/kf5-khtml.spec
index dbaa0e1..c623a80 100644
--- a/kf5-khtml.spec
+++ b/kf5-khtml.spec
@@ -7,34 +7,33 @@
 # /usr/share/kf5/kjava
 # /usr/share/khtml
 # /usr/share/kservices5 
-
-
-%define         _state          stable
-%define		orgname		khtml
+%define		kdeframever	5.4
+%define		qtver		5.3.2
+%define		kfname		khtml
 
 Summary:	HTML rendering engine
-Name:		kf5-%{orgname}
-Version:	5.0.0
+Name:		kf5-%{kfname}
+Version:	5.4.0
 Release:	0.1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/frameworks/%{version}/portingAids/%{orgname}-%{version}.tar.xz
-# Source0-md5:	609ff674c07e48ad781f6a50da060bd5
+Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/portingAids/%{kfname}-%{version}.tar.xz
+# Source0-md5:	65f90421ff7c061b025251ad07373d18
 URL:		http://www.kde.org/
-BuildRequires:	Qt5Core-devel >= 5.2.0
-BuildRequires:	Qt5DBus-devel
-BuildRequires:	Qt5Gui-devel >= 5.3.1
-BuildRequires:	Qt5Network-devel
-BuildRequires:	Qt5PrintSupport-devel
-BuildRequires:	Qt5Test-devel >= 5.2
-BuildRequires:	Qt5Widgets-devel
-BuildRequires:	Qt5X11Extras-devel >= 5.2
-BuildRequires:	Qt5Xml-devel
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5DBus-devel >= %{qtver}
+BuildRequires:	Qt5Gui-devel >= %{qtver}
+BuildRequires:	Qt5Network-devel >= %{qtver}
+BuildRequires:	Qt5PrintSupport-devel >= %{qtver}
+BuildRequires:	Qt5Test-devel >= %{qtver}
+BuildRequires:	Qt5Widgets-devel >= %{qtver}
+BuildRequires:	Qt5X11Extras-devel >= %{qtver}
+BuildRequires:	Qt5Xml-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	kf5-attica-devel >= %{version}
-BuildRequires:	kf5-extra-cmake-modules >= 1.0.0
+BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
 BuildRequires:	kf5-karchive-devel >= %{version}
 BuildRequires:	kf5-kauth-devel >= %{version}
 BuildRequires:	kf5-kbookmarks-devel >= %{version}
@@ -81,36 +80,25 @@ KHTML is a web rendering engine, based on the KParts technology and
 using KJS for JavaScript support.
 
 %package devel
-Summary:	Header files for %{orgname} development
-Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{orgname}
+Summary:	Header files for %{kfname} development
+Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{kfname}
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Header files for %{orgname} development.
+Header files for %{kfname} development.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla programistów używających %{orgname}.
+Pliki nagłówkowe dla programistów używających %{kfname}.
 
 %prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{kfname}-%{version}
 
 %build
 install -d build
 cd build
 %cmake \
-	-DBIN_INSTALL_DIR=%{_bindir} \
-	-DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \
-	-DPLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-	-DQT_PLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-	-DQML_INSTALL_DIR=%{qt5dir}/qml \
-	-DIMPORTS_INSTALL_DIR=%{qt5dirs}/imports \
-	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
-	-DKF5_LIBEXEC_INSTALL_DIR=%{_libexecdir} \
-	-DKF5_INCLUDE_INSTALL_DIR=%{_includedir} \
-	-DECM_MKSPECS_INSTALL_DIR=%{qt5dir}/mkspecs/modules \
-	-D_IMPORT_PREFIX=%{_prefix} \
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
 %{__make}
 
@@ -120,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build/ install \
         DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{orgname}5
+%find_lang %{kfname}5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,12 +116,12 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{orgname}5.lang
+%files -f %{kfname}5.lang
 %defattr(644,root,root,755)
 %doc README.md
 /etc/xdg/khtmlrc
 %attr(755,root,root) %ghost %{_libdir}/libKF5KHtml.so.5
-%attr(755,root,root) %{_libdir}/libKF5KHtml.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5KHtml.so.5.4.0
 %attr(755,root,root) %{_libdir}/qt5/plugins/kf5/parts/khtmladaptorpart.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kf5/parts/khtmlimagepart.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kf5/parts/khtmlpart.so
@@ -146,8 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kf5/kjava/kjava.jar
 %{_datadir}/kf5/kjava/kjava.policy
 %{_datadir}/kf5/kjava/pluginsinfo
-%{_datadir}/khtml/khtml5.rc
-%{_datadir}/khtml/khtml5_browser.rc
+%dir %{_datadir}/kxmlgui5/khtml
+%{_datadir}/kxmlgui5/khtml/khtml.rc
+%{_datadir}/kxmlgui5/khtml/khtml_browser.rc
+#%{_datadir}/khtml/khtml5.rc
+#%{_datadir}/khtml/khtml5_browser.rc
 %{_datadir}/kservices5/khtml.desktop
 %{_datadir}/kservices5/khtmladaptorpart.desktop
 %{_datadir}/kservices5/khtmlimage.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-khtml.git/commitdiff/564b5134242f1e05f0976174e7b82c4e0d3fbfe9



More information about the pld-cvs-commit mailing list