[packages/libwpe] - added libdir patch (fix libdir in .pc file) - pl, rely on CMAKE_BUILD_TYPE from cmake macro

qboosh qboosh at pld-linux.org
Mon Oct 7 16:07:53 CEST 2019


commit 22e2241033883965c1d41ab4e614165db99556a1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Oct 7 16:11:09 2019 +0200

    - added libdir patch (fix libdir in .pc file)
    - pl, rely on CMAKE_BUILD_TYPE from cmake macro

 libwpe-libdir.patch | 11 +++++++++++
 libwpe.spec         | 42 +++++++++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/libwpe.spec b/libwpe.spec
index b85b7e4..ace3f2f 100644
--- a/libwpe.spec
+++ b/libwpe.spec
@@ -1,44 +1,57 @@
 Summary:	General-purpose library for the WPE-flavored port of WebKit
+Summary(pl.UTF-8):	Ogólna biblioteka do portu WPE biblioteki WebKit
 Name:		libwpe
 Version:	1.4.0.1
 Release:	1
 License:	BSD
 Group:		Libraries
+#Source0Download: https://github.com/WebPlatformForEmbedded/libwpe/releases
 Source0:	https://github.com/WebPlatformForEmbedded/libwpe/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	1d4d38413ee0d0043f74d0445cab906f
+Patch0:		%{name}-libdir.patch
 URL:		https://wpewebkit.org/
-BuildRequires:	cmake
+BuildRequires:	EGL-devel
+BuildRequires:	cmake >= 3.0
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	xorg-lib-libxkbcommon-devel
-BuildRequires:	Mesa-libEGL-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-General-purpose library developed for the WPE-flavored port of WebKit
+General-purpose library developed for the WPE-flavored port of WebKit.
+
+%description -l pl.UTF-8
+Ogólna biblioteka do portu WPE biblioteki WebKit.
 
 %package devel
-Summary:	Header files for %{name} library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
+Summary:	Header files for WPE library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki WPE
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	EGL-devel
+Requires:	xorg-lib-libxkbcommon-devel
 
 %description devel
-Header files for %{name} library.
+Header files for WPE library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
+Pliki nagłówkowe biblioteki WPE.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%cmake . \
-  -DCMAKE_BUILD_TYPE=Release
+install -d build
+cd build
+%cmake ..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -50,12 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING NEWS
-%attr(755,root,root) %{_libdir}/%{name}-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/%{name}-1.0.so.1
+%attr(755,root,root) %{_libdir}/libwpe-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwpe-1.0.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/wpe-1.0/
-%attr(755,root,root) %{_libdir}/%{name}-1.0.so
+%attr(755,root,root) %{_libdir}/libwpe-1.0.so
+%{_includedir}/wpe-1.0
 %{_pkgconfigdir}/wpe-1.0.pc
-
diff --git a/libwpe-libdir.patch b/libwpe-libdir.patch
new file mode 100644
index 0000000..582da9c
--- /dev/null
+++ b/libwpe-libdir.patch
@@ -0,0 +1,11 @@
+--- libwpe-1.4.0.1/wpe.pc.cmake.orig	2019-10-01 15:26:02.000000000 +0200
++++ libwpe-1.4.0.1/wpe.pc.cmake	2019-10-07 15:51:30.398204638 +0200
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ 
+ Name: wpe- at WPE_API_VERSION@
+ Description: The wpe library
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libwpe.git/commitdiff/22e2241033883965c1d41ab4e614165db99556a1



More information about the pld-cvs-commit mailing list