[packages/libutf8proc] - rel 4; avoid includedir subdir (compatible with other distros)
arekm
arekm at pld-linux.org
Sat Apr 14 17:45:04 CEST 2018
commit f8274d04fe4385692919d8ca584f1686c82fba29
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Apr 14 17:44:57 2018 +0200
- rel 4; avoid includedir subdir (compatible with other distros)
libutf8proc-build.patch | 11 +++++++++++
libutf8proc.spec | 8 ++++----
2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/libutf8proc.spec b/libutf8proc.spec
index 74e6ff6..30f72c9 100644
--- a/libutf8proc.spec
+++ b/libutf8proc.spec
@@ -6,11 +6,12 @@ Summary: utf8proc library for NetSurf
Summary(pl.UTF-8): Biblioteka utf8proc dla projektu NetSurf
Name: libutf8proc
Version: 1.3.1
-Release: 3
+Release: 4
License: MIT
Group: Libraries
Source0: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-3-src.tar.gz
# Source0-md5: c427797a2e3172a0ebef68b37b682124
+Patch0: %{name}-build.patch
URL: http://www.netsurf-browser.org/projects/libutf8proc/
BuildRequires: netsurf-buildsystem >= 1.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,6 +75,7 @@ Statyczna biblioteka libutf8proc.
%prep
%setup -q -n %{name}-%{version}-3
+%patch0 -p1
%build
export AR="%{__ar}"
@@ -115,8 +117,6 @@ export LDFLAGS="%{rpmldflags}"
DESTDIR=$RPM_BUILD_ROOT
%endif
-sed -i -e 's#includedir=.*#includedir=${prefix}/include/%{name}#g' $RPM_BUILD_ROOT%{_pkgconfigdir}/libutf8proc.pc
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libutf8proc.so
-%{_includedir}/libutf8proc
+%{_includedir}/utf8proc.h
%{_pkgconfigdir}/libutf8proc.pc
%if %{with static_libs}
diff --git a/libutf8proc-build.patch b/libutf8proc-build.patch
new file mode 100644
index 0000000..81d561f
--- /dev/null
+++ b/libutf8proc-build.patch
@@ -0,0 +1,11 @@
+--- libutf8proc-1.3.1-3/Makefile~ 2018-04-14 17:42:42.000000000 +0200
++++ libutf8proc-1.3.1-3/Makefile 2018-04-14 17:43:23.719751330 +0200
+@@ -45,7 +45,7 @@
+ endif
+
+ # Extra installation rules
+-I := /$(INCLUDEDIR)/libutf8proc
++I := /$(INCLUDEDIR)
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libutf8proc/utf8proc.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libutf8proc.git/commitdiff/f8274d04fe4385692919d8ca584f1686c82fba29
More information about the pld-cvs-commit
mailing list