|
@@ -6,7 +6,7 @@
|
|
Name: apr
|
|
Name: apr
|
|
Summary: Apache Portable Runtime library
|
|
Summary: Apache Portable Runtime library
|
|
Summary(ja): Apache ポータブルランタイムライブラリ
|
|
Summary(ja): Apache ポータブルランタイムライブラリ
|
|
-Version: 1.5.2
|
|
+Version: 1.6.5
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
@@ -18,7 +18,7 @@ Distribution: Vine Linux
|
|
|
|
|
|
Source0: %{name}-%{version}.tar.bz2
|
|
Source0: %{name}-%{version}.tar.bz2
|
|
Source1: apr-wrapper.h
|
|
Source1: apr-wrapper.h
|
|
-Patch2: apr-0.9.7-deepbind.patch
|
|
+Patch1: apr-1.6.3-r1834495.patch
|
|
Patch3: apr-1.2.2-locktimeout.patch
|
|
Patch3: apr-1.2.2-locktimeout.patch
|
|
Patch4: apr-1.2.2-libdir.patch
|
|
Patch4: apr-1.2.2-libdir.patch
|
|
Patch5: apr-1.3.3-pkgconf.patch
|
|
Patch5: apr-1.3.3-pkgconf.patch
|
|
@@ -26,6 +26,9 @@ Patch5: apr-1.3.3-pkgconf.patch
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRequires: autoconf, libtool, python, doxygen
|
|
BuildRequires: autoconf, libtool, python, doxygen
|
|
BuildRequires: libuuid-devel
|
|
BuildRequires: libuuid-devel
|
|
|
|
+# To enable SCTP support
|
|
|
|
+BuildRequires: lksctp-tools-devel
|
|
|
|
+
|
|
Conflicts: subversion < 0.20.1-2
|
|
Conflicts: subversion < 0.20.1-2
|
|
Obsoletes: apache2-apr
|
|
Obsoletes: apache2-apr
|
|
|
|
|
|
@@ -51,7 +54,7 @@ C data structures and routines.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch2 -p1 -b .deepbind
|
|
+%patch1 -p1 -b .r1834495
|
|
%patch3 -p1 -b .locktimeout
|
|
%patch3 -p1 -b .locktimeout
|
|
%patch4 -p1 -b .libdir
|
|
%patch4 -p1 -b .libdir
|
|
%patch5 -p1 -b .pkgconf
|
|
%patch5 -p1 -b .pkgconf
|
|
@@ -109,6 +112,10 @@ if grep 'define SIZEOF_VOIDP 4' include/apr.h \
|
|
: LFS support not present in 32-bit build
|
|
: LFS support not present in 32-bit build
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
+pushd test
|
|
|
|
+ make %{?_smp_mflags}
|
|
|
|
+ ./testall -v -q
|
|
|
|
+popd
|
|
|
|
|
|
%clean
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
@@ -137,6 +144,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_includedir}/apr-%{aprver}/*.h
|
|
%{_includedir}/apr-%{aprver}/*.h
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.5-1
|
|
|
|
+- updated to 1.6.5.
|
|
|
|
+- dropped Patch2.
|
|
|
|
+- imported Patch1 from rawhide.
|
|
|
|
+
|
|
* Mon May 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.2-1
|
|
* Mon May 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.2-1
|
|
- updated to 1.5.2.
|
|
- updated to 1.5.2.
|
|
|
|
|