[packages/hwsd] - up to 1.3.0
baggins
baggins at pld-linux.org
Sat May 28 18:54:29 CEST 2016
commit 0fbf7f7ac6fb0d3d03eab99117688f4655db5d36
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat May 28 16:54:20 2016 +0000
- up to 1.3.0
hwsd-avahi.patch | 18 ------------------
hwsd-cmake.patch | 14 --------------
hwsd-lib.patch | 44 --------------------------------------------
hwsd.spec | 37 ++++++++++++++++++-------------------
servus.patch | 10 ++++++++++
5 files changed, 28 insertions(+), 95 deletions(-)
---
diff --git a/hwsd.spec b/hwsd.spec
index 33c46ad..ccaa84c 100644
--- a/hwsd.spec
+++ b/hwsd.spec
@@ -5,25 +5,25 @@
Summary: Local and remote ZeroConf service discovery for hardware resources
Summary(pl.UTF-8): Lokalne i zdalne wykrywanie usług ZeroConf dla zasobów sprzętowych
Name: hwsd
-Version: 1.1.1
-Release: 4
+Version: 1.3.0
+Release: 1
License: LGPL v2.1 (library), GPL v3+ (applications)
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
+# Source0-md5: 4c56f4dc80dfb0095c7ca8462a222e3a
+Patch0: servus.patch
URL: https://github.com/Eyescale/hwsd/
BuildRequires: Eyescale-CMake
BuildRequires: Lunchbox-devel >= 1.10
BuildRequires: OpenGL-GLX-devel
-BuildRequires: QtNetwork-devel >= 4.6
+BuildRequires: Qt5Core-devel
+BuildRequires: Qt5Network-devel
+BuildRequires: Servus-devel
BuildRequires: boost-devel >= 1.41.0
BuildRequires: cmake >= 2.8
%{?with_apidocs:BuildRequires: doxygen}
-BuildRequires: gcc-c++ >= 6:4.2
BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.2
BuildRequires: pkgconfig
BuildRequires: xorg-lib-libX11-devel
Requires: Lunchbox >= 1.10
@@ -32,8 +32,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
HW-SD is a library and daemon for the discovery and announcement of
-hardware resources using ZeroConf. It enables auto-configuration
-of ad-hoc GPU clusters and multi-GPU machines.
+hardware resources using ZeroConf. It enables auto-configuration of
+ad-hoc GPU clusters and multi-GPU machines.
%description -l pl.UTF-8
HW-SD to biblioteka i demon do wyszukiwania i rozgłaszania zasobów
@@ -68,8 +68,6 @@ Dokumentacja API biblioteki HW-SD.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
ln -s %{_datadir}/Eyescale-CMake CMake/common
%{__rm} .gitexternals
@@ -101,17 +99,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE.txt README.md doc/{AUTHORS,RelNotes.md}
+%doc LICENSE.txt README.md doc/{AUTHORS,Changelog.md}
+%attr(755,root,root) %{_bindir}/hw_sd
+%attr(755,root,root) %{_bindir}/hw_sd_list
%attr(755,root,root) %{_libdir}/libhwsd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhwsd.so.2
+%attr(755,root,root) %ghost %{_libdir}/libhwsd.so.3
%attr(755,root,root) %{_libdir}/libhwsd_gpu_glx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhwsd_gpu_glx.so.1
+%attr(755,root,root) %ghost %{_libdir}/libhwsd_gpu_glx.so.3
%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) %ghost %{_libdir}/libhwsd_gpu_dns_sd.so.3
%attr(755,root,root) %{_libdir}/libhwsd_net_sys.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_sys.so.1
+%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_sys.so.3
%attr(755,root,root) %{_libdir}/libhwsd_net_dns_sd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_dns_sd.so.1
+%attr(755,root,root) %ghost %{_libdir}/libhwsd_net_dns_sd.so.3
%files devel
%defattr(644,root,root,755)
@@ -121,7 +121,6 @@ rm -rf $RPM_BUILD_ROOT
%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
%{_datadir}/hwsd/CMake
diff --git a/hwsd-avahi.patch b/hwsd-avahi.patch
deleted file mode 100644
index fe99b77..0000000
--- a/hwsd-avahi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-cmake.patch b/hwsd-cmake.patch
deleted file mode 100644
index 352bcde..0000000
--- a/hwsd-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hwsd-1.1.1/CMakeLists.txt.orig 2014-10-07 13:54:35.000000000 +0200
-+++ hwsd-1.1.1/CMakeLists.txt 2014-12-20 18:55:43.575418516 +0100
-@@ -20,11 +20,6 @@
- set(COMMON_PROJECT_DOMAIN ch.eyescale)
-
- include(Common)
--include(Buildyard)
--
--if(BUILDYARD_STOP)
-- return()
--endif()
-
- if(APPLE)
- # WAR otherwise MacPorts X11 (/opt/local) is preferred
diff --git a/hwsd-lib.patch b/hwsd-lib.patch
deleted file mode 100644
index fffd0ff..0000000
--- a/hwsd-lib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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)
diff --git a/servus.patch b/servus.patch
new file mode 100644
index 0000000..ed1e66f
--- /dev/null
+++ b/servus.patch
@@ -0,0 +1,10 @@
+--- hwsd-1.3.0/hwsd/functions.h~ 2015-11-02 15:14:17.000000000 +0000
++++ hwsd-1.3.0/hwsd/functions.h 2016-05-28 16:49:03.655901391 +0000
+@@ -21,6 +21,7 @@
+ #include <hwsd/api.h>
+ #include <hwsd/filter.h>
+ #include <hwsd/types.h>
++#include <servus/servus.h>
+
+
+ namespace hwsd
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hwsd.git/commitdiff/0fbf7f7ac6fb0d3d03eab99117688f4655db5d36
More information about the pld-cvs-commit
mailing list