[packages/hwsd] - added lib patch (use LIB_SUFFIX also for remaining libraries in project) - added avahi patch (buil
qboosh
qboosh at pld-linux.org
Sun Dec 21 14:19:35 CET 2014
commit d65fd2cc2b47548beac193f6b3a0f7656d7135b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 21 14:20:26 2014 +0100
- added lib patch (use LIB_SUFFIX also for remaining libraries in project)
- added avahi patch (build dns_sd libraries also when Lunchbox uses avahi)
hwsd-avahi.patch | 18 ++++++++++++++++++
hwsd-lib.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
hwsd.spec | 10 ++++++++++
3 files changed, 72 insertions(+)
---
diff --git a/hwsd.spec b/hwsd.spec
index 997dccd..09bf38b 100644
--- a/hwsd.spec
+++ b/hwsd.spec
@@ -12,6 +12,8 @@ Group: Libraries
Source0: https://github.com/Eyescale/hwsd/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 315a8543078db1be6c1600cf5d964e93
Patch0: %{name}-cmake.patch
+Patch1: %{name}-lib.patch
+Patch2: %{name}-avahi.patch
URL: https://github.com/Eyescale/hwsd/
BuildRequires: Eyescale-CMake
BuildRequires: Lunchbox-devel >= 1.10
@@ -66,6 +68,8 @@ Dokumentacja API biblioteki HW-SD.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
ln -s %{_datadir}/Eyescale-CMake CMake/common
%{__rm} .gitexternals
@@ -102,14 +106,20 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %ghost %{_libdir}/libhwsd.so.2
%attr(755,root,root) %{_libdir}/libhwsd_gpu_glx.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhwsd_gpu_glx.so.1
+%attr(755,root,root) %{_libdir}/libhwsd_gpu_dns_sd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhwsd_gpu_dns_sd.so.1
%attr(755,root,root) %{_libdir}/libhwsd_net_sys.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_sys.so.1
+%attr(755,root,root) %{_libdir}/libhwsd_net_dns_sd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_dns_sd.so.1
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libhwsd.so
%attr(755,root,root) %{_libdir}/libhwsd_gpu_glx.so
+%attr(755,root,root) %{_libdir}/libhwsd_gpu_dns_sd.so
%attr(755,root,root) %{_libdir}/libhwsd_net_sys.so
+%attr(755,root,root) %{_libdir}/libhwsd_net_dns_sd.so
%{_includedir}/hwsd
%{_pkgconfigdir}/hwsd.pc
%dir %{_datadir}/hwsd
diff --git a/hwsd-avahi.patch b/hwsd-avahi.patch
new file mode 100644
index 0000000..fe99b77
--- /dev/null
+++ b/hwsd-avahi.patch
@@ -0,0 +1,18 @@
+--- hwsd-1.1.1/hwsd/gpu/dns_sd/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/gpu/dns_sd/CMakeLists.txt 2014-12-21 14:01:23.399969469 +0100
+@@ -1,5 +1,5 @@
+
+-if(NOT LUNCHBOX_USE_DNSSD)
++if(NOT LUNCHBOX_USE_DNSSD AND NOT LUNCHBOX_USE_AVAHI_CLIENT)
+ return()
+ endif()
+
+--- hwsd-1.1.1/hwsd/net/dns_sd/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/net/dns_sd/CMakeLists.txt 2014-12-21 14:02:22.629695398 +0100
+@@ -1,5 +1,5 @@
+
+-if(NOT LUNCHBOX_USE_DNSSD)
++if(NOT LUNCHBOX_USE_DNSSD AND NOT LUNCHBOX_USE_AVAHI_CLIENT)
+ return()
+ endif()
+
diff --git a/hwsd-lib.patch b/hwsd-lib.patch
new file mode 100644
index 0000000..fffd0ff
--- /dev/null
+++ b/hwsd-lib.patch
@@ -0,0 +1,44 @@
+--- hwsd-1.1.1/hwsd/gpu/dns_sd/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/gpu/dns_sd/CMakeLists.txt 2014-12-21 14:01:23.399969469 +0100
+@@ -28,6 +28,6 @@
+ PUBLIC_HEADER "${HEADERS}" COMPILE_DEFINITIONS "HWSD_SHARED")
+ install(TARGETS ${LIBRARY}
+ PUBLIC_HEADER DESTINATION ${INCLUDE} COMPONENT dev
+- ARCHIVE DESTINATION lib COMPONENT dev
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+ RUNTIME DESTINATION bin COMPONENT lib
+- LIBRARY DESTINATION lib COMPONENT lib)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib)
+--- hwsd-1.1.1/hwsd/gpu/glx/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/gpu/glx/CMakeLists.txt 2014-12-21 14:01:45.274432635 +0100
+@@ -27,6 +27,6 @@
+ SOVERSION ${VERSION_MAJOR} PUBLIC_HEADER "${HEADERS}")
+ install(TARGETS ${LIBRARY}
+ PUBLIC_HEADER DESTINATION ${INCLUDE} COMPONENT dev
+- ARCHIVE DESTINATION lib COMPONENT dev
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+ RUNTIME DESTINATION bin COMPONENT lib
+- LIBRARY DESTINATION lib COMPONENT lib)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib)
+--- hwsd-1.1.1/hwsd/net/dns_sd/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/net/dns_sd/CMakeLists.txt 2014-12-21 14:02:22.629695398 +0100
+@@ -28,6 +28,6 @@
+ PUBLIC_HEADER "${HEADERS}" COMPILE_DEFINITIONS "HWSD_SHARED")
+ install(TARGETS ${LIBRARY}
+ PUBLIC_HEADER DESTINATION ${INCLUDE} COMPONENT dev
+- ARCHIVE DESTINATION lib COMPONENT dev
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+ RUNTIME DESTINATION bin COMPONENT lib
+- LIBRARY DESTINATION lib COMPONENT lib)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib)
+--- hwsd-1.1.1/hwsd/net/sys/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
++++ hwsd-1.1.1/hwsd/net/sys/CMakeLists.txt 2014-12-21 14:02:39.353892543 +0100
+@@ -21,6 +21,6 @@
+ PUBLIC_HEADER "${HEADERS}" COMPILE_DEFINITIONS "HWSD_SHARED")
+ install(TARGETS ${LIBRARY}
+ PUBLIC_HEADER DESTINATION ${INCLUDE} COMPONENT dev
+- ARCHIVE DESTINATION lib COMPONENT dev
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+ RUNTIME DESTINATION bin COMPONENT lib
+- LIBRARY DESTINATION lib COMPONENT lib)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hwsd.git/commitdiff/d65fd2cc2b47548beac193f6b3a0f7656d7135b2
More information about the pld-cvs-commit
mailing list