- updated to 0.7

- removed obsolete libdir patch
- added pc patch to fix some .pc file entries

diff --git a/libmysofa-libdir.patch b/libmysofa-libdir.patch
deleted file mode 100644 (file)
index 75c9bad..0000000
--- a/libmysofa-libdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmysofa-0.6/src/CMakeLists.txt.orig      2017-07-11 13:36:33.000000000 +0200
-+++ libmysofa-0.6/src/CMakeLists.txt   2019-02-25 20:57:05.602899695 +0100
-@@ -50,7 +50,7 @@
- target_link_libraries (mysofa-static ${MATH} ${ZLIB_LIBRARIES})
- SET_TARGET_PROPERTIES(mysofa-static PROPERTIES OUTPUT_NAME mysofa CLEAN_DIRECT_OUTPUT 1 POSITION_INDEPENDENT_CODE ON)
- install(TARGETS mysofa-static
--  ARCHIVE DESTINATION lib)
-+  ARCHIVE DESTINATION lib${LIB_SUFFIX})
- 
- if(BUILD_SHARED_LIBS)
-   add_library(mysofa-shared SHARED ${libsrc})
-@@ -62,7 +62,7 @@
-   GENERATE_EXPORT_HEADER(mysofa-shared BASE_NAME mysofa EXPORT_FILE_NAME ${CMAKE_SOURCE_DIR}/src/hrtf/mysofa_export.h)
-   install(TARGETS mysofa-shared 
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib)
-+    LIBRARY DESTINATION lib${LIB_SUFFIX})
- else()
-   GENERATE_EXPORT_HEADER(mysofa-static BASE_NAME mysofa EXPORT_FILE_NAME ${CMAKE_SOURCE_DIR}/src/hrtf/mysofa_export.h)
- endif()

diff --git a/libmysofa-pc.patch b/libmysofa-pc.patch
new file mode 100644 (file)
index 0000000..7ad6041
--- /dev/null
+++ b/libmysofa-pc.patch
@@ -0,0 +1,26 @@
+--- libmysofa-0.7/libmysofa.pc.cmake.orig      2019-03-31 17:16:24.000000000 +0200
++++ libmysofa-0.7/libmysofa.pc.cmake   2019-07-23 06:26:11.184737290 +0200
+@@ -3,8 +3,8 @@
+ Version: @PROJECT_VERSION@
+ Requires: @PKG_CONFIG_REQUIRES@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/include
+-libdir=${prefix}/lib
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ Libs: -L${libdir} -lmysofa
+ Cflags: -I${includedir}
+ 
+--- libmysofa-0.7/CMakeLists.txt.orig  2019-03-31 17:16:24.000000000 +0200
++++ libmysofa-0.7/CMakeLists.txt       2019-07-23 06:33:15.395772475 +0200
+@@ -15,8 +15,8 @@
+ SET(CPACK_GENERATOR "DEB")
+ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "IOhannes m zmölnig")
+ SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+-SET(CPACK_PACKAGE_VERSION_MINOR "5")
+-SET(CPACK_PACKAGE_VERSION_PATCH "1")
++SET(CPACK_PACKAGE_VERSION_MINOR "7")
++SET(CPACK_PACKAGE_VERSION_PATCH "0")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g")
+ 
+ SET(PKG_CONFIG_PRIVATELIBS "")

diff --git a/libmysofa.spec b/libmysofa.spec
index 511780a66fe48207222d19a03ee230dbc8381825..ad5ecd49b76bc213b4ffe6067330e3847a185641 100644 (file)
--- a/libmysofa.spec
+++ b/libmysofa.spec
@@ -1,14 +1,14 @@
 Summary:       Library to read AES SOFA files
 Summary(pl.UTF-8):     Biblioteka do odczytu plików AES SOFA
 Name:          libmysofa
-Version:       0.6
+Version:       0.7
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/hoene/libmysofa/releases
 Source0:       https://github.com/hoene/libmysofa/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9d595f890b93693a796835d43cf276ec
-Patch0:                %{name}-libdir.patch
+# Source0-md5: 2711bb53924cd086b625e9aab84d195f
+Patch0:                %{name}-pc.patch
 URL:           https://github.com/hoene/libmysofa
 BuildRequires: CUnit
 BuildRequires: cmake >= 2.8
@@ -84,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmysofa.so
 %{_includedir}/mysofa.h
+%{_pkgconfigdir}/libmysofa.pc
 
 %files static
 %defattr(644,root,root,755)