diff --git a/.gitignore b/.gitignore index 5e44c50..8b3ee80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,4 @@ -/libmicrohttpd-0.9.22* .build* /noarch /x86_64 -/libmicrohttpd-0.9.24.tar.gz -/libmicrohttpd-0.9.27.tar.gz -/libmicrohttpd-0.9.28.tar.gz -/libmicrohttpd-0.9.29.tar.gz -/libmicrohttpd-0.9.30.tar.gz -/libmicrohttpd-0.9.31.tar.gz -/libmicrohttpd-0.9.32.tar.gz -/libmicrohttpd-0.9.33.tar.gz +/libmicrohttpd-0.9.34* diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 1293a6e..5a627ee 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,12 +1,13 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.9.33 +Version: 0.9.34 Release: 1%{?dist} Group: Development/Libraries License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.gnu.org/software/libmicrohttpd/ Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Patch0: libmicrohttpd-0.9.34-spdy-pc.patch BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 5 @@ -56,15 +57,44 @@ BuildArch: noarch %description doc Doxygen documentation for libmicrohttpd and some example source code +%package -n libmicrospdy +Summary: Lightweight library for embedding a webserver using the SPDY protocol +Group: Development/Libraries + +%description -n libmicrospdy +GNU libmicrospdy is a small C library that is supposed to make it +easy to run a SPDY server as part of another application. + +The library is part of the libmicrohttpd project and source tree +and shared its advantages of being fast aand small with a simple API. + +%package -n libmicrospdy-devel +Summary: Development files for libmicrospdy +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n libmicrospdy-devel +Development files for libmicrospdy + +%package -n microspdy2http +Summary: Translates incoming SPDY requests to http server on localhost +Group: Applications/Internet + +%description -n microspdy2http +Translates incoming SPDY requests to HTTP server on localhost. +* Uses libcurl +* No error handling for curl requests + %prep %setup -q +%patch0 -p1 -b .spdy-pc %build # Required because patches modify .am files -# autoreconf --force +autoreconf --install --force %configure --disable-static --with-gnutls make %{?_smp_mflags} -cd doc/doxygen && make full && cd - +make -C doc/doxygen full # Disabled for now due to problems reported at # https://gnunet.org/bugs/view.php?id=1619 @@ -75,8 +105,9 @@ cd doc/doxygen && make full && cd - rm -rf %{buildroot} make install DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/libmicrohttpd.la +rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_infodir}/dir +rm -f %{buildroot}%{_bindir}/demo # Install some examples in /usr/share/doc/libmicrohttpd-doc/examples mkdir examples @@ -120,7 +151,26 @@ fi %doc examples %doc html +%files -n libmicrospdy +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libmicrospdy.so.* + +%files -n libmicrospdy-devel +%defattr(-,root,root,-) +%{_includedir}/microspdy.h +%{_libdir}/libmicrospdy.so +%{_libdir}/pkgconfig/libmicrospdy.pc + +%files -n microspdy2http +%defattr(-,root,root,-) +%{_bindir}/microspdy2http + %changelog +* Thu Mar 13 2014 Tim Niemueller - 0.9.34-1 +- Update to latest uptsream release 0.9.34 +- Create sub-packages for libmicrospdy which is now enabled by default + * Thu Jan 02 2014 Václav Pavlín - 0.9.33-1 - Update to latest upstream release 0.9.33 diff --git a/sources b/sources index 976c6b5..cf30184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -013b10f9de1cda5448b29c81305354a3 libmicrohttpd-0.9.33.tar.gz +2947eee13c2c8affb95023a0cb6fda0c libmicrohttpd-0.9.34.tar.gz