[packages/wpebackend-fdo] - added libdir patch (fixes libdir in .pc file) - pl, completed BRs

qboosh qboosh at pld-linux.org
Mon Oct 7 19:20:25 CEST 2019


commit 04d42b76ba4f95f66771e710d97ff5a7cf26a248
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Oct 7 19:23:43 2019 +0200

    - added libdir patch (fixes libdir in .pc file)
    - pl, completed BRs

 wpebackend-fdo-libdir.patch | 11 +++++++++++
 wpebackend-fdo.spec         | 38 +++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 13 deletions(-)
---
diff --git a/wpebackend-fdo.spec b/wpebackend-fdo.spec
index 0aea1f1..bf119d8 100644
--- a/wpebackend-fdo.spec
+++ b/wpebackend-fdo.spec
@@ -1,4 +1,6 @@
+# TODO: apidocs (BR: hotdoc, like libwpe.spec)
 Summary:	A WPE backend designed for Linux desktop systems
+Summary(pl.UTF-8):	Backend WPE zaprojektowany dla biurkowych systemów linuksowych
 Name:		wpebackend-fdo
 Version:	1.4.0
 Release:	1
@@ -6,40 +8,52 @@ License:	BSD
 Group:		Libraries
 Source0:	https://wpewebkit.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	63553c3f43593c2a8c587c32e88fdf3c
+Patch0:		%{name}-libdir.patch
 URL:		https://wpewebkit.org/
-BuildRequires:	Mesa-libEGL-devel
-BuildRequires:	cmake
-BuildRequires:	glib2-devel
+BuildRequires:	EGL-devel
+BuildRequires:	cmake >= 3.0
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libwpe-devel
-BuildRequires:	wayland-devel
-BuildRequires:	xorg-lib-libxkbcommon-devel
+BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	wayland-devel >= 1.10
+BuildRequires:	wayland-egl-devel >= 1.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A WPE backend designed for Linux desktop systems.
 
+%description -l pl.UTF-8
+Backend WPE zaprojektowany dla biurkowych systemów linuksowych.
+
 %package devel
-Summary:	Header files for %{name} library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
+Summary:	Header files for WPEBackend-fdo library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki WPEBackend-fdo
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libwpe-devel
 
 %description devel
-Header files for %{name} library.
+Header files for WPEBackend-fdo library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
+Pliki nagłówkowe biblioteki WPEBackend-fdo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%cmake .
+install -d build
+cd build
+%cmake ..
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -59,5 +73,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libWPEBackend-fdo-1.0.so
 %{_includedir}/wpe-fdo-1.0
 %{_pkgconfigdir}/wpebackend-fdo-1.0.pc
-
-%changelog
diff --git a/wpebackend-fdo-libdir.patch b/wpebackend-fdo-libdir.patch
new file mode 100644
index 0000000..44684e2
--- /dev/null
+++ b/wpebackend-fdo-libdir.patch
@@ -0,0 +1,11 @@
+--- wpebackend-fdo-1.4.0/wpebackend-fdo.pc.in.orig	2019-09-18 14:32:18.000000000 +0200
++++ wpebackend-fdo-1.4.0/wpebackend-fdo.pc.in	2019-10-07 18:53:23.889081185 +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: wpebackend-fdo- at WPEBACKEND_FDO_API_VERSION@
+ Description: The WPEBackend-fdo library
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wpebackend-fdo.git/commitdiff/04d42b76ba4f95f66771e710d97ff5a7cf26a248



More information about the pld-cvs-commit mailing list