[packages/flif] - updated install patch to fix lib suffix
qboosh
qboosh at pld-linux.org
Sun Dec 5 21:36:09 CET 2021
commit 1e2d46faf0cd29d3b89db82114932e2274ce262f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 5 21:36:04 2021 +0100
- updated install patch to fix lib suffix
flif-install.patch | 24 +++++++++++++++++++++++-
flif.spec | 2 --
2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/flif.spec b/flif.spec
index 516162f..00a6c78 100644
--- a/flif.spec
+++ b/flif.spec
@@ -196,9 +196,7 @@ rm -rf $RPM_BUILD_ROOT
# already in file
%{__rm} $RPM_BUILD_ROOT%{_datadir}/FLIF/flif.magic
-install -Dp doc/flif.1 $RPM_BUILD_ROOT%{_mandir}/man1/flif.1
install -Dp doc/flif.bash-completion $RPM_BUILD_ROOT%{bash_compdir}/flif
-install tools/{apng2flif,gif2flif} $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/flif-install.patch b/flif-install.patch
index 77ff2c4..437ad70 100644
--- a/flif-install.patch
+++ b/flif-install.patch
@@ -1,5 +1,27 @@
--- FLIF-0.4/src/CMakeLists.txt.orig 2021-11-21 14:31:43.000000000 +0100
-+++ FLIF-0.4/src/CMakeLists.txt 2021-12-05 19:12:26.665932118 +0100
++++ FLIF-0.4/src/CMakeLists.txt 2021-12-05 21:23:49.719173409 +0100
+@@ -182,8 +182,8 @@ if(BUILD_SHARED_LIBS)
+ target_link_libraries(dflif_exe flif_lib_dec)
+ install(TARGETS flif_lib flif_lib_dec
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ PUBLIC_HEADER DESTINATION include)
+ endif(BUILD_SHARED_LIBS)
+
+@@ -220,8 +220,8 @@ if(BUILD_STATIC_LIBS)
+
+ install(TARGETS flif_lib_static flif_lib_dec_static
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ PUBLIC_HEADER DESTINATION include)
+
+ if (NOT(BUILD_SHARED_LIBS))
@@ -243,18 +243,10 @@ if(GDK_FOUND AND (BUILD_SHARED_LIBS OR B
target_link_libraries(pixbufloader-flif ${GDK_LIBRARIES})
set_target_properties(pixbufloader-flif PROPERTIES OUTPUT_NAME pixbufloader-flif)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flif.git/commitdiff/1e2d46faf0cd29d3b89db82114932e2274ce262f
More information about the pld-cvs-commit
mailing list