rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Revise some patches so that we don't have to run autoreconf.

Browse Source 
- Remove patch for GNOME bug #427939 (use a different work-around).
This commit is contained in:
Matthew Barnes 2007-04-30 19:22:54 +00:00
parent 09003fca27
commit 9c1c3426e2
2 changed files with 543 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1035
evolution-2.10.0-use-glib-i18n.patch
View File

File diff suppressed because it is too large Load Diff

32
evolution.spec
View File

@ -47,7 +47,7 @@
Name: evolution Name: evolution
Version: 2.10.1 Version: 2.10.1
Release: 8%{?dist} Release: 9%{?dist}
License: GPL License: GPL
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -158,20 +158,17 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch
# GNOME bug #418971 # GNOME bug #418971
Patch47: evolution-2.10.0-drop-old-glib-support.patch Patch47: evolution-2.10.0-drop-old-glib-support.patch
# GNOME bug #427939 (gnome-doc-utils)
Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
# RH bug #235878 / GNOME bug #386503 # RH bug #235878 / GNOME bug #386503
Patch49: evolution-2.10.1-fix-help.patch Patch48: evolution-2.10.1-fix-help.patch
# RH bug #234315 / GNOME bug #423766 # RH bug #234315 / GNOME bug #423766
Patch50: evolution-2.10.1-saving-attachments.patch Patch49: evolution-2.10.1-saving-attachments.patch
# RH bug #236860 / GNOME bug #407104 # RH bug #236860 / GNOME bug #407104
Patch51: evolution-2.10.1-fix-uri-handling.patch Patch50: evolution-2.10.1-fix-uri-handling.patch
# RH bug #236399 / GNOME bug #434019 # RH bug #236399 / GNOME bug #434019
Patch52: evolution-2.10.1-en_CA-attribution-format.patch Patch51: evolution-2.10.1-en_CA-attribution-format.patch
## Dependencies ### ## Dependencies ###
@ -325,11 +322,10 @@ Development files needed for building things which link against evolution.
%patch45 -p1 -b .shell-main-cleanups %patch45 -p1 -b .shell-main-cleanups
%patch46 -p1 -b .use-glib-i18n %patch46 -p1 -b .use-glib-i18n
%patch47 -p1 -b .drop-old-glib-support %patch47 -p1 -b .drop-old-glib-support
%patch48 -p1 -b .fix-gnome-doc-utils %patch48 -p1 -b .fix-help
%patch49 -p1 -b .fix-help %patch49 -p1 -b .saving-attachments
%patch50 -p1 -b .saving-attachments %patch50 -p1 -b .fix-uri-handling
%patch51 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format
%patch52 -p1 -b .en_CA-attribution-format
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -413,9 +409,9 @@ CFLAGS="$CFLAGS \
-Werror-implicit-function-declaration" -Werror-implicit-function-declaration"
%endif %endif
# Rerun the GNU Autotools since we patched some of the input files. # Temporary work-around for a bad gnome-doc-utils.make.
# Disable portability checking to keep automake 1.10 quiet. # See GNOME bug #427939. Should be fixed in evolution-2.10.2.
autoreconf --force --warnings=no-portability sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
%configure \ %configure \
--disable-scrollkeeper \ --disable-scrollkeeper \
@ -751,6 +747,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Mon Apr 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-9.fc7
- Revise some patches so that we don't have to run autoreconf.
- Remove patch for GNOME bug #427939 (use a different work-around).
* Fri Apr 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-8.fc7 * Fri Apr 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-8.fc7
- Add patch for RH bug #236399 (en_CA attribution format). - Add patch for RH bug #236399 (en_CA attribution format).