Added patch to work around upstream's broken AC_PROG_MKDIR_P

This commit is contained in:
Robert Scheck 2010-12-19 23:03:23 +01:00
parent 5caa9c402e
commit 2baf9b8127
3 changed files with 27 additions and 2 deletions

View File

@ -4,6 +4,8 @@ overlefts regarding ICAL_ERRORS_ARE_FATAL preprocessor conditions by correct one
which simply invalidates "#ifndef" and thus breaks applications like e.g. Zarafa Groupware. More which simply invalidates "#ifndef" and thus breaks applications like e.g. Zarafa Groupware. More
details can be found at: https://bugzilla.redhat.com/show_bug.cgi?id=575715 details can be found at: https://bugzilla.redhat.com/show_bug.cgi?id=575715
Upstream link: https://sourceforge.net/tracker/?func=detail&aid=3140405&group_id=16077&atid=316077
--- libical-0.46/src/libical/autogenex/ical.h 2010-08-30 22:05:05.000000000 +0200 --- libical-0.46/src/libical/autogenex/ical.h 2010-08-30 22:05:05.000000000 +0200
+++ libical-0.46/src/libical/autogenex/ical.h.errors-are-fatal 2010-12-19 21:39:10.000000000 +0100 +++ libical-0.46/src/libical/autogenex/ical.h.errors-are-fatal 2010-12-19 21:39:10.000000000 +0100
@@ -3272,7 +3272,7 @@ @@ -3272,7 +3272,7 @@

View File

@ -0,0 +1,18 @@
Patch by Robert Scheck <robert@fedoraproject.org> for libical >= 0.46, which removes the unused
AC_PROG_MKDIR_P macro, because Red Hat Enterprise Linux 4 and 5 (including derivates/downstreams)
have autoconf < 2.60, which don't support AC_PROG_MKDIR_P. Unfortunately, libical upstream ships
in libical 0.46 broken configure and Makefile files, thus autoreconf needs to be run downstream.
The somehow funny thing is, AC_PROG_MKDIR_P doesn't seem to be used anywhere in the source?!
Upstream link: https://sourceforge.net/tracker/?func=detail&aid=3140412&group_id=16077&atid=316077
--- libical-0.46/configure.in 2010-08-30 22:06:25.000000000 +0200
+++ libical-0.46/configure.in.mkdir_p 2010-12-19 22:48:00.000000000 +0100
@@ -17,7 +17,6 @@
AM_PROG_LEX
AC_PROG_LN_S
AC_PROG_INSTALL
-AC_PROG_MKDIR_P
dnl Initialize libtool
AM_PROG_LIBTOOL

View File

@ -1,13 +1,14 @@
Summary: Reference implementation of the iCalendar data type and serialization format Summary: Reference implementation of the iCalendar data type and serialization format
Name: libical Name: libical
Version: 0.46 Version: 0.46
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2 or MPLv1.1 License: LGPLv2 or MPLv1.1
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://freeassociation.sourceforge.net/ URL: http://freeassociation.sourceforge.net/
Source: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz Source: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
Patch0: libical-0.46-icaltimezone.patch Patch0: libical-0.46-icaltimezone.patch
Patch1: libical-0.46-errors-are-fatal.patch Patch1: libical-0.46-errors-are-fatal.patch
Patch2: libical-0.46-mkdir_p.patch
Requires: tzdata Requires: tzdata
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
BuildRequires: bison, byacc, flex BuildRequires: bison, byacc, flex
@ -30,7 +31,8 @@ applications that use libical.
%setup -q %setup -q
%patch0 -p1 -b .icaltimezone %patch0 -p1 -b .icaltimezone
%patch1 -p1 -b .errors-are-fatal %patch1 -p1 -b .errors-are-fatal
autoreconf -i %patch2 -p1 -b .mkdir_p
autoreconf -i -f
%build %build
%configure --disable-static --enable-reentrant --with-backtrace %configure --disable-static --enable-reentrant --with-backtrace
@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/%{name}/vobject.h %{_includedir}/%{name}/vobject.h
%changelog %changelog
* Sun Dec 19 2010 Robert Scheck <robert@fedoraproject.org> 0.46-2
- Added patch to work around upstream's broken AC_PROG_MKDIR_P
* Sun Dec 19 2010 Robert Scheck <robert@fedoraproject.org> 0.46-1 * Sun Dec 19 2010 Robert Scheck <robert@fedoraproject.org> 0.46-1
- Upgrade to 0.46 (#525933, #628893) - Upgrade to 0.46 (#525933, #628893)
- Fixed race in populating builtin timezone components (#637150) - Fixed race in populating builtin timezone components (#637150)