Merge tag 'upstream/1.41.0' into tizen_base 24/235824/2 accepted/tizen_6.0_base accepted/tizen_6.0_base_hotfix tizen_6.0_base tizen_6.0_base_hotfix accepted/tizen/6.0/base/20201029.110849 accepted/tizen/6.0/base/hotfix/20201102.093415 accepted/tizen/base/20200621.024405 submit/tizen_6.0_base/20201029.184801 submit/tizen_6.0_base_hotfix/20201030.192501 submit/tizen_6.0_base_hotfix/20201102.162701 submit/tizen_base/20200611.103626 tizen_6.0.m2_release
authorSeonah Moon <seonah1.moon@samsung.com>
Wed, 10 Jun 2020 05:22:21 +0000 (14:22 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Thu, 11 Jun 2020 07:45:23 +0000 (16:45 +0900)
Change-Id: I414c85019c548e2116d2731a4e128ea9887a7077

1  2 
configure.ac
packaging/nghttp2.spec

diff --cc configure.ac
Simple merge
index 7c15d44,0000000..ce01362
mode 100644,000000..100644
--- /dev/null
@@@ -1,60 -1,0 +1,60 @@@
- Version: 1.40.0
 +%define _unpackaged_files_terminate_build 0
 +Prefix: %{_usr}
 +Name: nghttp2
++Version: 1.41.0
 +Release: 1
 +Summary: This is an experimental implementation of Hypertext Transfer Protocol version 2.
 +Group: System Environment/Libraries
 +License: MIT
 +URL: https://nghttp2.org/
 +Source0: %{name}-%{version}.tar.gz
 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +
 +BuildRequires: pkgconfig >= 0.20, zlib >= 1.2.3, gcc, gcc-c++, make
 +BuildRequires: libopenssl1.1-devel
 +BuildRequires: libxml2-devel
 +
 +%description
 +
 +%package devel
 +Summary: Development files for %{name}
 +Group: Development/Libraries
 +Requires: %{name} = %{version}-%{release}
 +
 +%description devel
 +The %{name}-devel package contains libraries and header files for
 +developing applications that use %{name}.
 +
 +%prep
 +%setup -q
 +
 +%build
 +autoreconf -i
 +%{__automake}
 +%{__autoconf}
 +%configure --disable-static --disable-xmltest
 +%{__make} %{?_smp_mflags}
 +
 +%install
 +rm -rf $RPM_BUILD_ROOT
 +%{__make} install DESTDIR=$RPM_BUILD_ROOT
 +
 +%clean
 +rm -rf $RPM_BUILD_ROOT
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%{_libdir}/*.so*
 +%exclude %{_libdir}/*.la
 +%license COPYING
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%doc /usr/share/doc/%{name}
 +%{_includedir}/*
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc