From cf93736d3318f8c0ad810b97525c37a5dcc6d8e5 Mon Sep 17 00:00:00 2001 From: jackie_wu123 Date: Fri, 10 Jan 2020 17:30:52 +0800 Subject: [PATCH 1/3] delete patch --- libjpeg-turbo-cmake.patch | 52 --------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 libjpeg-turbo-cmake.patch diff --git a/libjpeg-turbo-cmake.patch b/libjpeg-turbo-cmake.patch deleted file mode 100644 index 2cee5e5..0000000 --- a/libjpeg-turbo-cmake.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cc548f5..023ff66 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1314,7 +1314,7 @@ endif() - - if(WITH_TURBOJPEG) - if(ENABLE_SHARED) -- install(TARGETS turbojpeg tjbench -+ install(TARGETS turbojpeg - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -@@ -1322,10 +1322,6 @@ if(WITH_TURBOJPEG) - if(ENABLE_STATIC) - install(TARGETS turbojpeg-static ARCHIVE - DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- if(NOT ENABLE_SHARED) -- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE} -- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) -- endif() - endif() - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -@@ -1345,18 +1341,6 @@ endif() - - install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg -- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) --if(WITH_JAVA) -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java -- DESTINATION ${CMAKE_INSTALL_DOCDIR}) --endif() -- - if(UNIX OR MINGW) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 - ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 -@@ -1370,7 +1354,7 @@ endif() - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h - ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h -- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h -+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/jpegint.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - include(cmakescripts/BuildPackages.cmake) -- Gitee From f42bf5a79d48952fc5c727c29d01a38acc577d8a Mon Sep 17 00:00:00 2001 From: jackie_wu123 Date: Mon, 13 Jan 2020 12:43:47 +0800 Subject: [PATCH 2/3] change spec --- libjpeg-turbo.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index a7ceb10..66f61bc 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -6,8 +6,6 @@ License: IJG URL: http://sourceforge.net/projects/libjpeg-turbo Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz -Patch0: libjpeg-turbo-cmake.patch - BuildRequires: gcc cmake libtool nasm Obsoletes: libjpeg < 6b-47 turbojpeg = %{version}-%{release} -- Gitee From 886df88258e0a96672eb60417878694a275d6af4 Mon Sep 17 00:00:00 2001 From: jackie_wu123 Date: Mon, 13 Jan 2020 14:39:57 +0800 Subject: [PATCH 3/3] change spec --- libjpeg-turbo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 66f61bc..e1fc179 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -88,6 +88,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags} %{_bindir}/* %{_libdir}/libjpeg.so.62* %{_libdir}/libturbojpeg.so.0* +%exclude /usr/share/doc/libjpeg-turbo/* %files devel %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.txt tjexample.c -- Gitee