commit 374551cfac7ad1e285d75b0529562c63910b02db
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 30 11:18:19 2019 +0100
- up to 2.4.0
- .pc file is now provided upstream (requires prefix= to be created
properly)
libutf8proc.pc.in | 10 ----------
utf8proc.spec | 15 ++++-----------
2 files changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/utf8proc.spec b/utf8proc.spec
index 1762403..44cb9a8 100644
--- a/utf8proc.spec
+++ b/utf8proc.spec
@@ -1,16 +1,15 @@
# NOTE: PLD currently uses netsurf fork (libutf8proc.spec)
-# They differ in used buildsystem; netsurf provides .pc file upstream.
+# They differ in used buildsystem
Summary: utf8proc library for NetSurf
Summary(pl.UTF-8): Biblioteka utf8proc dla projektu NetSurf
Name: utf8proc
-Version: 2.2.0
+Version: 2.4.0
Release: 0.1
License: MIT
Group: Libraries
#Source0Download: https://github.com/JuliaStrings/utf8proc/releases
Source0:
https://github.com/JuliaStrings/utf8proc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4514e50c9973f73375cd059fca22ad8e
-Source1: libutf8proc.pc.in
+# Source0-md5: ccea4d10dc45749166273ae370e9ceed
URL: https://github.com/JuliaStrings/utf8proc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,16 +62,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
+ prefix=%{_prefix} \
includedir=%{_includedir} \
libdir=%{_libdir}
-# julialang version doesn't provide .pc file
-test ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/libutf8proc.pc
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-%{__sed} -e 's,@VERSION@,%{version},' \
- -e 's,@prefix@,%{_prefix},' \
- -e 's,@libdir@,%{_libdir},' %{SOURCE1}
>>$RPM_BUILD_ROOT%{_pkgconfigdir}/libutf8proc.pc
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/libutf8proc.pc.in b/libutf8proc.pc.in
deleted file mode 100644
index 4678e4e..0000000
--- a/libutf8proc.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=@libdir@
-includedir=${prefix}/include
-
-Name: libutf8proc
-Description: UTF8 processing
-Version: @VERSION@
-Libs: -L${libdir} -lutf8proc
-Cflags: -I${includedir} -DUTF8PROC_EXPORTS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/utf8proc.git/commitdiff/374551cfac7ad1e285d75b0529562c63910b02db
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
