commit 90f28ccab388316a1c6d09739bf08537fa794d2a
Merge: fb01205 22e21b7
Author: Jan Palus <[email protected]>
Date: Sun Aug 30 18:35:36 2020 +0200
Merge remote-tracking branch 'origin/DEVEL-1.12' into master
libupnp-openssl.patch | 12 ++++++++++++
libupnp.spec | 14 ++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --cc libupnp.spec
index de1bd76,02ac29e..0d7259e
--- a/libupnp.spec
+++ b/libupnp.spec
@@@ -6,13 -7,15 +6,16 @@@ Release: 0.
License: BSD
Group: Libraries
Source0:
http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
-# Source0-md5: 9c4f2d5d412c802a54c861ec3395a57d
+# Source0-md5: be649223f0cf781aff2316e20eaac225
Patch0: %{name}-opt.patch
+ Patch1: %{name}-openssl.patch
URL: http://pupnp.sourceforge.net/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.8
+BuildRequires: doxygen
BuildRequires: libtool >= 2:1.5
+ BuildRequires: openssl-devel
+ BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@@ -32,7 -35,7 +35,8 @@@ Summary: Header files for libupn
Summary(pl.UTF-8): Pliki nagłówkowe libupnp
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+ Requires: openssl-devel
+Conflicts: libupnp1.6-devel
%description devel
This package contains header files for the Linux SDK for UPnP Devices
@@@ -80,10 -87,10 +89,11 @@@ Dokumentacja API bibliotek upnp
%{__autoheader}
%{__automake}
%configure \
- --disable-silent-rules \
- %{?debug:--enable-debug}
+ %{?debug:--enable-debug} \
+ --enable-open-ssl \
+ --disable-silent-rules
%{__make}
+%{__make} -C docs docs
%install
rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libupnp.git/commitdiff/e4cc968b11429f71368f6d3561191a65729f6b1e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
