From b0c4b36843ba35c4b6a28d86fad657daa95c86e7 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: May 21 2011 03:02:52 +0000 Subject: Bump up to 1.4.5. --- diff --git a/.gitignore b/.gitignore index 7b856d9..13807b9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ apr-1.3.9.tar.bz2 /x86_64 /.build*.log /apr-1.4.4.tar.bz2 +/apr-1.4.5.tar.bz2 diff --git a/apr-1.4.4-top_builddir.patch b/apr-1.4.4-top_builddir.patch deleted file mode 100644 index 311ca52..0000000 --- a/apr-1.4.4-top_builddir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-05-03 03:04:46.000000000 +1000 -+++ b/Makefile.in 2011-05-10 12:42:31.428378451 +1000 -@@ -66,7 +66,7 @@ - - # Create apr_rules.mk suitable for the install tree - build/apr_rules.out: build/apr_rules.mk -- sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ -+ sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ - - install: $(TARGETS) - $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ diff --git a/apr-1.4.4.tar.bz2.asc b/apr-1.4.4.tar.bz2.asc deleted file mode 100644 index e3be830..0000000 --- a/apr-1.4.4.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABCgAGBQJNxEq6AAoJEOxYLrY5/wkseXsQALXdbQjG5yr0zOQSONES82Ie -SL6VMwwceh94D5p/fPBrOfB1FaVFpCsQn+I5BXNiwlT5Mlkl3A+TAyrPv3A+f+ty -ROhBb4IybD7KmTcwt6MXewrq2j8AEk+vUDDeVrLxRTusrD4TYcZBtja0Buo4h924 -qMoC2H+6nlvaL7nQdiR3oubsUoUVi+eqVuej+y8UsJgA2f2viNRxWCLA2IoYDWir -FIHgGcAuacMAKMjQDxDIQw/aoVwVqORXjt7v+AZYJHaxIoI8v9+pIamvX9JAz0CR -+WIqOk5NoJ0g34GQboHx+2iznB5hYZWMZeK9EUUgNsqm4y49PpI32k6EEr79UKm8 -s5Wnh25JZkTp2Ty3UKDa87PD5bB1Y2I1rU9N5JelHaVea6rtK7f9x0aeE5qpAYD+ -7Lt5OBS+A+vLSKwSZ6T0RQGd2RN0vu5B9XG+m3hdFHg2/9biSqUVQrjc2pWb9c49 -VGIB2zwBYEtJdfP39atmUFiI6HarPPcPRo5CL/MsHHXSiVgIF99IfYRjqRxOXr/p -vqhZlGCZRxcqimZ94un+rjVRdPZHX3A/EQq0Jg+eBJ1OFaTvP5KZ/GFhQEZCQEz0 -znzJYMiCg9jJALgjsGEwxE79AqdF7PCSmRRsIGk6fVwmEv878SNpC60Xxn+ZwkDs -sZ4r6aSojncjlshuSa4O -=WEeu ------END PGP SIGNATURE----- diff --git a/apr-1.4.5.tar.bz2.asc b/apr-1.4.5.tar.bz2.asc new file mode 100644 index 0000000..c5f6329 --- /dev/null +++ b/apr-1.4.5.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCgAGBQJN1bE9AAoJEOxYLrY5/wkszlgP/0gRoTctrY92WKmNtSJ1FJ4a +GbCJGjjT0/SeH0VhGF2nVaAmyiM5hPPiMm5jmrce5JynB839O0H2BkRQzLdWjr92 +teUb4j2ljAGfneu/C5YEkb4i8zQ5US1Aes2V8al47dMDCtvmv6LbhmYBz+HRXPZ/ +WmnBz9l5u6k8ZR2EbBXNKXx6b07yWL36IpubOXeCtHlxwYbLGmFhjqk712XbpPzr +Ps5LFgGAWidr6zrBImZ0Qr77TMn/l2GFcIK4G7GvEHVodAHIdsbdVzpbA0Xa/JQ+ +1RS1Bza7lAcGEvXchKxm5D0P3bzBdn+285zmwh4s6sX/RpGlrmCHGGGZDKKgHynL +KiGs4D/sK/CcsGfUpdFjc4/Ve6JuE79EZx2h4KyugWu8cbgITLU8DvNne0BKEjKV +yALyKVA4rt6bHVpN90LbPBqBvQK1G8VBebvlb2J20y2+pHTv8Q2PJW+ZuF8scp+L +gWmqTs8VbaWDQ/LLrjEgYyTVOyGHlX+0WCiFkmGUoNNtdxX7S92QloTNSQFudASR +AwptTz3UTCHfP+XWGJb+9VCnBuNVSpabQcU++cbIwoy9/Nv/6Ua3kuwU04MQGBeO +1xm0234Pjtrmy6G2hyT66jMwBv4jjSB/3Njhy+39bREzulLKhO8L4mRMAITHz4bk +pvk9yEmjPvvygZLFtize +=rIKs +-----END PGP SIGNATURE----- diff --git a/apr.spec b/apr.spec index be38c41..9b1e8e9 100644 --- a/apr.spec +++ b/apr.spec @@ -5,8 +5,8 @@ Summary: Apache Portable Runtime library Name: apr -Version: 1.4.4 -Release: 2%{?dist} +Version: 1.4.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.4.4-top_builddir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, libtool, libuuid-devel, python # To enable SCTP support @@ -46,7 +45,6 @@ C data structures and routines. %patch2 -p1 -b .locktimeout %patch3 -p1 -b .libdir %patch4 -p1 -b .pkgconf -%patch5 -p1 -b .top_builddir %build # regenerate configure script etc. @@ -127,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Fri May 20 2011 Bojan Smojver - 1.4.5-1 +- bump up to 1.4.5 + * Tue May 10 2011 Bojan Smojver - 1.4.4-2 - fix top_builddir in apr_rules.mk diff --git a/sources b/sources index 136be64..b4ca5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -daf5487c82dd7bec9c005c96f8cb01b1 apr-1.4.4.tar.bz2 +8b53f5a5669d0597f2da889a2f576eb6 apr-1.4.5.tar.bz2