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

- Consolidate "missing declarations" patches.

Browse Source 
- Add patch for RH bug #202383.
This commit is contained in:
Matthew Barnes 2006-08-14 18:59:55 +00:00
parent 94eedf24e5
commit 7fabf75566
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
evolution.spec
View File

@ -37,7 +37,7 @@
# Upstream tarballs often contain instances of undeclared functions; these tend # Upstream tarballs often contain instances of undeclared functions; these tend
# to work on i386 but fail on 64-bit architectures. Leave this on to trap the # to work on i386 but fail on 64-bit architectures. Leave this on to trap the
# warnings as errors (and ideally get the flag into the upstream build): # warnings as errors (and ideally get the flag into the upstream build):
%define require_function_declarations 0 %define require_function_declarations 1
%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
@ -45,7 +45,7 @@
Name: evolution Name: evolution
Version: 2.7.91 Version: 2.7.91
Release: 2 Release: 3
License: GPL License: GPL
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -85,9 +85,9 @@ Patch16: evolution-2.5.4-fix-conduit-dir.patch
Patch17: evolution-2.7.1-no-gnome-common.patch Patch17: evolution-2.7.1-no-gnome-common.patch
# XXX Make sure these are still needed and push them upstream. # XXX Make sure these are still needed and push them upstream.
Patch18: evolution-2.4.1-fix-missing-declarations.patch #Patch18: evolution-2.4.1-fix-missing-declarations.patch
Patch19: evolution-2.5.4-fix-missing-declarations.patch #Patch19: evolution-2.5.4-fix-missing-declarations.patch
Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch #Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
Patch21: evolution-2.7.1-notification-cleanups.patch Patch21: evolution-2.7.1-notification-cleanups.patch
Patch22: evolution-2.6.0-prototypes.patch Patch22: evolution-2.6.0-prototypes.patch
@ -116,6 +116,11 @@ Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
# RH bug #197868 / Gnome.org bug #350823 # RH bug #197868 / Gnome.org bug #350823
Patch30: evolution-2.7.91-default-mailer.patch Patch30: evolution-2.7.91-default-mailer.patch
Patch31: evolution-2.7.91-fix-missing-declarations.patch
# RH bug #202383
Patch32: evolution-2.7.91-fix-duplicate-alarm.patch
### Dependencies ### ### Dependencies ###
Requires: ORBit2 >= %{orbit2_version} Requires: ORBit2 >= %{orbit2_version}
@ -236,9 +241,9 @@ Development files needed for building things which link against evolution.
#patch15 -p1 -b .fix-conduits # leave commented #patch15 -p1 -b .fix-conduits # leave commented
%patch16 -p1 -b .fix-conduit-dir %patch16 -p1 -b .fix-conduit-dir
%patch17 -p1 -b .no-gnome-common %patch17 -p1 -b .no-gnome-common
%patch18 -p1 -b .fix-missing-declarations #patch18 -p1 -b .fix-missing-declarations
%patch19 -p1 -b .fix-missing-declarations-2-5-4 #patch19 -p1 -b .fix-missing-declarations-2-5-4
%patch20 -p1 -b .fix-missing-declarations-2.5.5.1 #patch20 -p1 -b .fix-missing-declarations-2.5.5.1
%patch21 -p1 -b .notification-cleanups %patch21 -p1 -b .notification-cleanups
%patch22 -p1 -b .prototypes %patch22 -p1 -b .prototypes
%patch23 -p1 -b .quit-resize-crash %patch23 -p1 -b .quit-resize-crash
@ -249,6 +254,8 @@ Development files needed for building things which link against evolution.
%patch28 -p1 -b .submit-bug-report %patch28 -p1 -b .submit-bug-report
%patch29 -p1 -b .deleting-preedit-buffer %patch29 -p1 -b .deleting-preedit-buffer
%patch30 -p1 -b .default-mailer %patch30 -p1 -b .default-mailer
%patch31 -p1 -b .fix-missing-declarations
%patch32 -p1 -b .fix-duplicate-alarm
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -639,6 +646,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Mon Aug 14 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-3
- Consolidate "missing declarations" patches.
- Add patch for RH bug #202383.
* Fri Aug 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-2 * Fri Aug 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-2
- Add patch for RH bug #197868. - Add patch for RH bug #197868.