commit cf4f311a178b1ba4c9780ca6730f09df0700388f
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Jun 12 20:41:46 2024 +0200
- updated to 2.4.3
ptex-pc.patch | 34 ++++++++++++++++++++++++++++++++++
ptex.spec | 11 +++++++----
2 files changed, 41 insertions(+), 4 deletions(-)
---
diff --git a/ptex.spec b/ptex.spec
index d705851..50e268f 100644
--- a/ptex.spec
+++ b/ptex.spec
@@ -5,13 +5,14 @@
Summary: Ptex - texture mapping system by Walt Disney Animation Studios
Summary(pl.UTF-8): Ptex - system odwzorowywania tekstur z Walt Disney
Animation Studios
Name: ptex
-Version: 2.4.2
+Version: 2.4.3
Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/wdas/ptex/tags
Source0:
https://github.com/wdas/ptex/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 286a63357de9cbc41511a54231891f61
+# Source0-md5: dcea5a45ab22315c8dfb294682618e18
+Patch0: %{name}-pc.patch
URL: http://ptex.us/
BuildRequires: cmake >= 3.8.0
%{?with_apidocs:BuildRequires: doxygen}
@@ -83,8 +84,9 @@ Dokumentacja API biblioteki Ptex.
%prep
%setup -q
+%patch0 -p1
-# see CMakeLists.txt:34-38 (if (NOT DEFINED PTEX_VER) ...)
+# see CMakeLists.txt:47-58 (if (NOT DEFINED PTEX_VER) ...)
echo %{version} > version
%build
@@ -122,7 +124,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libPtex.so
%{_includedir}/Ptex*.h
-%{_datadir}/cmake/Ptex
+%{_libdir}/cmake/Ptex
+%{_pkgconfigdir}/ptex.pc
%files static
%defattr(644,root,root,755)
diff --git a/ptex-pc.patch b/ptex-pc.patch
new file mode 100644
index 0000000..73a84f5
--- /dev/null
+++ b/ptex-pc.patch
@@ -0,0 +1,34 @@
+--- ptex-2.4.3/src/build/ptex.pc.in.orig 2024-04-30 20:49:17.000000000
+0200
++++ ptex-2.4.3/src/build/ptex.pc.in 2024-06-12 20:10:24.641778377 +0200
+@@ -5,10 +5,10 @@
+ # Good tutoral for understanding .pc files:
+ # https://people.freedesktop.org/~dbn/pkg-config-guide.html
+
+-prefix="@CMAKE_INSTALL_PREFIX@"
+-exec_prefix="${prefix}"
+-libdir="@CMAKE_INSTALL_PKGCONFIG_LIBDIR@"
+-includedir="@CMAKE_INSTALL_PKGCONFIG_INCLUDEDIR@"
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=@CMAKE_INSTALL_PKGCONFIG_LIBDIR@
++includedir=@CMAKE_INSTALL_PKGCONFIG_INCLUDEDIR@
+
+ Name: @PROJECT_NAME@
+ Description: @CMAKE_PROJECT_DESCRIPTION@
+@@ -16,6 +16,6 @@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+ Version: @PROJECT_VERSION@
+ Requires: @pc_req_public@
+ Requires.private: @pc_req_private@
+-Cflags: -I"${includedir}"
+-Libs: -L"${libdir}" -l@PTEX_OUTPUT_NAME@
++Cflags: -I${includedir}
++Libs: -L${libdir} -l@PTEX_OUTPUT_NAME@
+
+--- ptex-2.4.3/src/build/CMakeLists.txt.orig 2024-04-30 20:49:17.000000000
+0200
++++ ptex-2.4.3/src/build/CMakeLists.txt 2024-06-12 20:10:57.934931346
+0200
+@@ -38,4 +38,4 @@ else()
+ endif()
+ configure_file("${PROJECT_NAME_LOWERCASE}.pc.in"
"${PROJECT_NAME_LOWERCASE}.pc" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}.pc"
+- COMPONENT devel DESTINATION share/pkgconfig)
++ COMPONENT devel DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ptex.git/commitdiff/cf4f311a178b1ba4c9780ca6730f09df0700388f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
