-%bcond_without static # don't build static library
-%include /usr/lib/rpm/macros.perl
-%define apxs /usr/sbin/apxs
+#
+# Conditional build:
+%bcond_without static_libs # don't build static library
+%bcond_with tests # perform "make test"
+
+%define apxs /usr/sbin/apxs
+%define pdir libapreq2
Summary: Apache Request Library
-Summary(pl): Biblioteka ¿±dañ Apache
+Summary(pl.UTF-8): Biblioteka żądań Apache
Name: libapreq2
-#%define _devel 03
-Version: 2.05
+Version: 2.17
Release: 2
-License: Apache Group
+License: Apache v2.0
Group: Libraries
-Source0: http://www.apache.org/dist/httpd/libapreq/%{name}-%{version}-dev.tar.gz
-# Source0-md5: 0985e102b6d2bc9c747a56b04a85cba6
-URL: http://httpd.apache.org/apreq/
+Source0: https://www.apache.org/dist/httpd/libapreq/%{name}-%{version}.tar.gz
+# Source0-md5: 41cd2091aa5b5560858566a74b1346f2
+Source1: apache-mod_apreq2.conf
+Patch0: am.patch
+URL: https://httpd.apache.org/apreq/
BuildRequires: %{apxs}
-BuildRequires: apache >= 2.0.46
+BuildRequires: apache-base >= 2.0.46
BuildRequires: apache-devel >= 2.0.46
-BuildRequires: apache-mod_perl-devel >= 1.99
+BuildRequires: apache-mod_perl-devel >= 1:2
BuildRequires: apr-devel >= 1.0.0
BuildRequires: autoconf >= 2.53
BuildRequires: automake
-BuildRequires: perl-ExtUtils-XSBuilder >= 0.23
BuildRequires: libtool
+BuildRequires: perl-Apache-Test
+BuildRequires: perl-ExtUtils-XSBuilder >= 0.23
+BuildRequires: perl-mod_perl
+BuildRequires: rpm-perlprov
+BuildRequires: rpmbuild(macros) >= 1.745
+%if %{with tests}
+BuildRequires: apache-mod_mime
+BuildRequires: perl-libwww
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+
%description
libapreq is a safe, standards-compliant, high-performance library used
for parsing HTTP cookies, query-strings and POST data.
Version 2 of libapreq is an improved codebase designed around APR and
Apache-2's input filter API.
-%description -l pl
+%description -l pl.UTF-8
libapreq to bezpieczna, zgodna ze standardami, wysoko wydajna
-biblioteka s³u¿±ca do przetwarzania ciasteczek HTTP, ³añcuchów zapytañ
+biblioteka służąca do przetwarzania ciasteczek HTTP, łańcuchów zapytań
oraz danych POST.
Wersja 2 libapreq to ulepszony kod opracowany na bazie APR i API
-filtra wej¶ciowego Apache 2.
+filtra wejściowego Apache 2.
%package devel
Summary: libapreq2 header files
-Summary(pl): Pliki nag³ówkowe libapreq2
+Summary(pl.UTF-8): Pliki nagłówkowe libapreq2
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: apache-devel >= 2.0
%description devel
libapreq2 header files.
-%description devel -l pl
-Pliki nag³ówkowe biblioteki libapreq2.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libapreq2.
%package static
Summary: libapreq2 static library
-Summary(pl): Statyczna biblioteka libapreq2
+Summary(pl.UTF-8): Statyczna biblioteka libapreq2
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
Static version of libapreq2 library.
-%description static -l pl
+%description static -l pl.UTF-8
Statyczna wersja biblioteki libapreq2.
%package -n perl-%{name}
-Summary: Perl APIs for libapreq2 - Apache::Request and Apache::Cookie
-Summary(pl): Perlowe API dla libapreq2 - Apache::Request i Apache::Cookie
+Summary: Perl APIs for libapreq2 - Apache2::Request and Apache2::Cookie
+Summary(pl.UTF-8): Perlowe API dla libapreq2 - Apache2::Request i Apache2::Cookie
Group: Development/Languages/Perl
-Conflicts: perl-libapreq
%description -n perl-%{name}
-Perl APIs for libapreq2 - Apache::Request and Apache::Cookie.
+Perl APIs for libapreq2 - Apache2::Request and Apache2::Cookie.
+
+%description -n perl-%{name} -l pl.UTF-8
+Perlowe API dla libapreq2 - Apache2::Request i Apache2::Cookie.
+
+%package -n apache-mod_apreq2
+Summary: Apache module mod_apreq2
+Summary(pl.UTF-8): Moduł serwera Apache mod_apreq2
+Group: Networking/Daemons
+Requires: apache(modules-api) = %apache_modules_api
+Obsoletes: apache-mod_libapreq2 < 2.07-2
-%description -n perl-%{name} -l pl
-Perlowe API dla libapreq2 - Apache::Request i Apache::Cookie.
+%description -n apache-mod_apreq2
+Apache module mod_apreq2.
+
+%description -n apache-mod_apreq2 -l pl.UTF-8
+Moduł mod_apreq2 do serwera Apache.
%prep
-%setup -q -n %{name}-%{version}-dev
+%setup -q
+%patch0 -p1
%build
-%{__perl} -pi -e "s:apr-config:apr-1-config:g" acinclude.m4 Makefile.PL
-%{__perl} -pi -e "s:apu-config:apu-1-config:g" acinclude.m4 Makefile.PL
%{__libtoolize}
%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
+ --with-mm-opts="INSTALLDIRS=vendor" \
--enable-perl-glue \
--with-apache2-apxs=%{apxs} \
- %{!?with_static:--disable-static}
+ %{!?with_static_libs:--disable-static}
%{__make}
-cd glue/perl
-%{__perl} Makefile.PL \
- INSTALLDIRS=vendor
-%{__make} \
- OPTIMIZE="%{rpmcflags}"
-cd ../..
-# TODO: mod_apreq
+%{?with_tests:%{__make} test}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__make} -C glue/perl install \
- DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/APR/{Request.pod,Request/*.pod}
+rm -f $RPM_BUILD_ROOT%{apachelibdir}/mod_apreq2.{a,la}
+install -Dp %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/76_mod_apreq2.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post -n apache-mod_apreq2
+%service -q httpd restart
+
+%preun -n apache-mod_apreq2
+if [ "$1" = "0" ]; then
+ %service -q httpd restart
+fi
+
%files
%defattr(644,root,root,755)
%doc CHANGES README
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/libapreq2.so.*.*
+%ghost %{_libdir}/libapreq2.so.3
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libapreq2.so
+%{_libdir}/libapreq2.la
%{_includedir}/apreq2
-#%{_mandir}/man3/libapreq.3*
-#%{_examplesdir}/%{name}-%{version}
+%attr(755,root,root) %{_bindir}/apreq2-config
+%dir %{_includedir}/apache/apreq2
+%{_includedir}/apache/apreq2/apreq_module_apache2.h
-%if %{with static}
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libapreq2.a
%endif
%files -n perl-%{name}
%defattr(644,root,root,755)
%{perl_vendorarch}/Apache2/*.pm
-%dir %{perl_vendorarch}/APR
%{perl_vendorarch}/APR/*.pm
%dir %{perl_vendorarch}/APR/Request
-%{perl_vendorarch}/APR/Request/*
-
-%{perl_vendorarch}/auto/APR/*
+%{perl_vendorarch}/APR/Request/*.pm
+%dir %{perl_vendorarch}/auto/APR/Request
+%dir %{perl_vendorarch}/auto/APR/Request/Apache2
+%dir %{perl_vendorarch}/auto/APR/Request/CGI
+%dir %{perl_vendorarch}/auto/APR/Request/Cookie
+%dir %{perl_vendorarch}/auto/APR/Request/Error
+%dir %{perl_vendorarch}/auto/APR/Request/Hook
+%dir %{perl_vendorarch}/auto/APR/Request/Param
+%dir %{perl_vendorarch}/auto/APR/Request/Parser
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/Request/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/Request/*/*.so
# TODO: generate these manually; Makefile.PL (and overall logic) is broken
%{_mandir}/man3/Apache*
%{_mandir}/man3/APR*
+
+%files -n apache-mod_apreq2
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_apreq2.conf
+%attr(755,root,root) %{apachelibdir}/mod_apreq2.so
projects / packages / libapreq2.git / blobdiff