X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhwsd.git;a=blobdiff_plain;f=hwsd.spec;h=0bd8141950c6e0a434ff83432c7be325471590c1;hp=09bf38b6d3dc420b4bfd6cba45892a17569e349a;hb=2149c28a9db0d7afa2b4230a89bbb1cba41936ef;hpb=d65fd2cc2b47548beac193f6b3a0f7656d7135b2

diff --git a/hwsd.spec b/hwsd.spec
index 09bf38b..0bd8141 100644
--- a/hwsd.spec
+++ b/hwsd.spec
@@ -1,29 +1,29 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-#
+
 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:	1
+Version:	2.0.0
+Release:	2
 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:	85fbf643de9748f1cc8fcb3df813b625
+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
@@ -58,6 +58,9 @@ Pliki nagłówkowe biblioteki HW-SD.
 Summary:	HW-SD API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki HW-SD
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API documentation for HW-SD library.
@@ -68,8 +71,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 +102,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/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.4
 %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.4
 %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.4
 %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.4
 %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.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -121,7 +124,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