diff --git a/apr-1.3.3-libtool22.patch b/apr-1.3.3-libtool22.patch deleted file mode 100644 index 8c1d912..0000000 --- a/apr-1.3.3-libtool22.patch +++ /dev/null @@ -1,33 +0,0 @@ - -http://svn.apache.org/viewvc?rev=733052&view=rev - ---- apr-1.3.3/buildconf.libtool22 -+++ apr-1.3.3/buildconf -@@ -45,6 +45,14 @@ $libtoolize --copy --automake - - if [ -f libtool.m4 ]; then - ltfile=`pwd`/libtool.m4 -+elif grep all_pkgmacro_files $libtoolize > /dev/null; then -+ # libtool 2.x -+ aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` -+ ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` -+ for f in $ltfiles; do -+ test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build -+ done -+ ltfile=$aclocal_dir/libtool.m4 - else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" ---- apr-1.3.3/configure.in.libtool22 -+++ apr-1.3.3/configure.in -@@ -20,6 +20,10 @@ sinclude(build/apr_win32.m4) - sinclude(build/apr_hints.m4) - sinclude(build/libtool.m4) - sinclude(build/ltsugar.m4) -+sinclude(build/argz.m4) -+sinclude(build/ltoptions.m4) -+sinclude(build/ltversion.m4) -+sinclude(build/lt~obsolete.m4) - - dnl Hard-coded inclusion at the tail end of apr_private.h: - AH_BOTTOM([ diff --git a/apr-1.3.3.tar.bz2.asc b/apr-1.3.3.tar.bz2.asc deleted file mode 100644 index cb8223a..0000000 --- a/apr-1.3.3.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) - -iQIVAwUASJ00r4FUZ7bLm57FAQKfCRAAnkokqQazX0sFI+BmMbyIei12XdpnhA7h -64rs4h9u70MHRjad+E1jfy/YBbayVnqY7KfN0vcIeOY2R6eNebyvDZJLUISO6vJc -IZuNBBLuIPSUBPIBLM2Qt5Ke1eiVC7ApWCc9ZMiT5A4pmWOQQqyxxWXl1QPaACXu -YyH9Zwy+Y3gsCZwPCpaPBAOsq2rgyc2dUsyN3TkRe4P7+f8SEl602yN5QdmUFzaS -cHhQMfBkrYQcqJVgEzNSuCzuhbO2VVCn9EXpFuwsu11iDPO/oUY15qy+PVt974H0 -giKt/o5Dl1y/Lu4/Gvn31JV6gzzmTDcci9X+Om2WlQbEfYNPdQm3eqLNsWTdOqUj -6if/Fgb6PIedEpneYOjW9zpJhlFeoKNY6+q6r1TIsEk/Ijqny/s3o+JADgENEUo3 -eWUIy9H/10byfiKMKqJZ36M9B6GVe5RBo3lq33tloWVGc+8iE7cxgpJMnWopX0Gs -p2S9JdgZM/f2sxPKaRVu+wprKJL1fkWf8d5jUN3MIIENyL7BhRYEpc+Ogaci6VPL -kocpPmAEbjbU/FkDRqbD7Bh7aJENLgDB+viuT0YJyd57Rw8S9P3mTeilP0r27GR7 -DsNPKhhR90qh/Gov1iOjlZ1gE8a/PDxYUG+v2JqVaHFifCwcFsGrPrSoFu9sfORX -kzCVLO6Xgus= -=E6lf ------END PGP SIGNATURE----- diff --git a/apr-1.3.5.tar.bz2.asc b/apr-1.3.5.tar.bz2.asc new file mode 100644 index 0000000..128e9c2 --- /dev/null +++ b/apr-1.3.5.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAABAgAGBQJKJosLAAoJEIFUZ7bLm57Fe94QAMCm0yundoo+pnhT5dcUR8Ju +6xU3fSCa5D4hUHSS6ZdyPtT8rmKRtUABhT/TkG8SY8VNLGoRB+ndBxaOyTbmmtRB +XP2uz7B5VSlsp3svYfSE+YDj6m/OjesWjVhxr++9QMCcRpSvkJviJGMZFNstUF9s +L8gPJk52ixqD/aiJlzKmL8f1OprTqpt0Isk6Cu7+1SIO4y18+PfluBGwvhjKlX9H +EwLiJ3/OzA4rBBkAMMSV/EeTLlKlOpZbIJF6NWm3Q3dkTB38niNs/iTalsWG1dHG +oWpiouK88R2pT/pzu+R9kzpTKY9H0cyuC90LfSotof1oBNm598k5fL3+5cp/zSo1 +OrLDwel20qij5EgsZpgENpOoG4u9aIp/ojkFfXfp1XpP2nxiGIDGsWh4BMbyzb58 +HzD+56p5IfraL8i4nz6JO4sQKbj9ueqaw47D4WYBbQ0DFLXXz/3iftzuTPaTbmU8 +JOcIGu55DQztYGpXXhYb3qDCv9NjzUNn2OTGXRUH5Sr4fu97MSKdUVLFrSdRwvj+ +cJGnhgUQ4WRlHwappMMOyFZn/PsvdsTc2uAhlr35Pi2SCJTrQoLLnKfxG0vJ9yBO +6qQR61CRqRM8Q5u5Mt6AfG+5NXeoSZUKgHAv02ISzBANWMbeh3bYLCW7WmrKzJN+ +2R135dDXJeVeQ5sql7Ox +=8czj +-----END PGP SIGNATURE----- diff --git a/apr.spec b/apr.spec index 3e1aab9..587bb12 100644 --- a/apr.spec +++ b/apr.spec @@ -5,8 +5,8 @@ Summary: Apache Portable Runtime library Name: apr -Version: 1.3.3 -Release: 4%{?dist} +Version: 1.3.5 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -16,7 +16,6 @@ Patch1: apr-0.9.7-deepbind.patch Patch2: apr-1.2.2-locktimeout.patch Patch3: apr-1.2.2-libdir.patch Patch4: apr-1.2.7-pkgconf.patch -Patch5: apr-1.3.3-libtool22.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, libtool, e2fsprogs-devel, python @@ -44,7 +43,6 @@ C data structures and routines. %patch2 -p1 -b .locktimeout %patch3 -p1 -b .libdir %patch4 -p1 -b .pkgconf -%patch5 -p1 -b .libtool22 %build # regenerate configure script etc. @@ -123,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Mon Jun 8 2009 Bojan Smojver - 1.3.5-1 +- bump up to 1.3.5 + * Mon Feb 23 2009 Fedora Release Engineering - 1.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 176a63a..ef4da24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2090c21dee4f0eb1512604127dcd158f apr-1.3.3.tar.bz2 +9ac9a00eaa190937fdbbde7b4f03ac1e apr-1.3.5.tar.bz2