pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=49

Browse Source
This commit is contained in:
OBS User unknown 2008-11-02 23:51:24 +00:00 committed by Git OBS Bridge
parent 5f28d1c362
commit f668a06c53
3 changed files with 127 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
evolution-shared-nss-db.patch Normal file
View File

@ -0,0 +1,38 @@
diff -upr evolution-2.24.1-old/configure.in evolution-2.24.1-new/configure.in
--- evolution-2.24.1-old/configure.in 2008-10-19 22:27:24.000000000 -0500
+++ evolution-2.24.1-new/configure.in 2008-10-26 17:46:09.000000000 -0600
@@ -1015,6 +1015,9 @@ if test "x${enable_nss}" = "xyes" || tes
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
msg_smime="yes (Mozilla NSS)"
fi
+
+ mozilla_nss="$mozilla_nss nss-shared-helper"
+
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library])
diff -upr evolution-2.24.1-old/smime/lib/e-cert-db.c evolution-2.24.1-new/smime/lib/e-cert-db.c
--- evolution-2.24.1-old/smime/lib/e-cert-db.c 2008-10-13 03:33:03.000000000 -0500
+++ evolution-2.24.1-new/smime/lib/e-cert-db.c 2008-10-26 19:15:48.000000000 -0600
@@ -76,6 +76,7 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-util-private.h"
#include <libedataserverui/e-passwords.h>
+#include <nss-shared-helper.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -169,7 +170,12 @@ initialize_nss (void)
#endif
/* we initialize NSS here to make sure it only happens once */
- success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path));
+ success = (SECSuccess == nsshelp_open_db ("evolution", evolution_dir_path, 0));
+
+ if (!success) {
+ g_warning ("Opening non-shared cert database");
+ success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path));
+ }
if (!success) {
success = (SECSuccess == NSS_Init (evolution_dir_path));
if (success)

17
evolution.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Oct 31 15:54:05 CET 2008 - msuman@suse.de
- Invoke the binaries from a script which sets the library path
for picking the LDAP libraries.
-------------------------------------------------------------------
Tue Oct 28 18:39:33 CST 2008 - maw@suse.de
- Tag evo-core-mapi-changes.diff.
-------------------------------------------------------------------
Sun Oct 26 23:45:11 CST 2008 - hpj@novell.com
- Add evolution-shared-nss-db.patch, which migrates the old NSS
cert DB to the new, shared format and location.
-------------------------------------------------------------------
Fri Oct 24 10:11:54 IST 2008 - msuman@suse.de

119
evolution.spec
View File

@ -20,7 +20,11 @@
Name: evolution
BuildRequires: bison
%if %suse_version > 1100
BuildRequires: evoldap2-devel
%else
BuildRequires: openldap2-devel
%endif
BuildRequires: evolution-data-server-devel
BuildRequires: fdupes
BuildRequires: gnome-common
@ -37,6 +41,7 @@ BuildRequires: libpisock-devel
BuildRequires: libpisync-devel
BuildRequires: mozilla-nss-devel
BuildRequires: notification-daemon
BuildRequires: nss-shared-helper-devel
BuildRequires: perl-XML-Parser
BuildRequires: pilot-link
BuildRequires: psmisc
@ -52,7 +57,7 @@ Group: Productivity/Networking/Email/Clients
# BASE_VERSION as defined in configure.in.
%define evolution_base_version 2.24
Version: 2.24.1
Release: 1
Release: 2
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source0: %{name}-%{version}.tar.bz2
Source1: summerdance-about2.png
@ -78,7 +83,9 @@ Patch9: fix-sendrecv.diff
Patch13: pst-import.patch
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in /usr/lib/evoldap/include
Patch15: evolution-custom-openldap-includes.patch
# This patch contains changes in the core code base for the MAPI provider.
# PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
Patch16: evolution-shared-nss-db.patch
# PATCH-FIX-UPSTREAM evo-core-mapi-changes.diff msuman@suse.de -- This patch contains changes in the core code base for the MAPI provider.
Patch100: evo-core-mapi-changes.diff
Url: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -313,6 +320,7 @@ Authors:
%patch9
%patch13
%patch15 -p1
%patch16 -p1
%patch100 -p1
%build
@ -332,7 +340,11 @@ sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
%configure \
--libexecdir=%{_prefix}/lib \
--disable-scrollkeeper \
%if %suse_version > 1100
--with-openldap=%{_libdir}/evoldap \
%else
--with-openldap=yes \
%endif
--with-pisock \
--enable-pilot-conduits=yes \
--with-krb5=/usr \
@ -370,6 +382,11 @@ rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*.*a
rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*/*.*a
rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
%fdupes $RPM_BUILD_ROOT
%if %suse_version > 1100
%{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin
echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \$@\n\nexit \$?" > $RPM_BUILD_ROOT/%{_bindir}/evolution
%{__chmod} +x $RPM_BUILD_ROOT/%{_bindir}/evolution
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -429,6 +446,14 @@ fi
%{_libdir}/evolution/*/conduits/*.so
%changelog
* Fri Oct 31 2008 msuman@suse.de
- Invoke the binaries from a script which sets the library path
for picking the LDAP libraries.
* Wed Oct 29 2008 maw@suse.de
- Tag evo-core-mapi-changes.diff.
* Mon Oct 27 2008 hpj@novell.com
- Add evolution-shared-nss-db.patch, which migrates the old NSS
cert DB to the new, shared format and location.
* Fri Oct 24 2008 msuman@suse.de
- Update to version 2.24.1
+ Bugs fixed: bgo#364542, bgo#438155, bgo#497928, bgo#511918,
@ -458,14 +483,14 @@ fi
bgo#539536, bgo#551548, bgo#551628, bgo#551895, bgo#551915, and
bgo#552911
+ Updated translations.
* Tue Sep 16 2008 maw@suse.de
* Wed Sep 17 2008 maw@suse.de
- Updated the source tarball to svn r36353.
- Update to svn r36353.
* Mon Sep 08 2008 maw@suse.de
- Update to version 2.23.92:
+ Bug fixed: bgo#549968
+ Updated translations.
* Tue Sep 02 2008 maw@suse.de
* Wed Sep 03 2008 maw@suse.de
- Update to version 2.23.91:
+ Bugs fixed: bgo#458512, bgo#509647, bgo#523327, bgo#525555,
bgo#534762, bgo#544430, bgo#546926, bgo#547822, bgo#547822,
@ -572,7 +597,7 @@ fi
bug-394641_evo-CVE-2008-1109.diff
- bnc#395708 - bgo-395708_prefer-plain.patch - Outlook meeting invites look as text messages
- bnc#394441 - bnc-394441-exchange-addbook-crash.diff - Addressbook crash
* Tue May 20 2008 msuman@suse.de
* Wed May 21 2008 msuman@suse.de
- Added
+ bgo-534012-backup-permission.patch (Sankar P)
+ bgo-533820-fix-crash-on-border-clicking-meetings.diff (Chenthill P) (bnc#391993)
@ -630,7 +655,7 @@ fi
* Wed Apr 09 2008 msuman@suse.de
- Configurable proxy settings for Evolution (Varadhan)
+ Added patch: bnc-188523-evo-fix-authenticated-proxy-support.diff (bnc#188523)
* Thu Mar 13 2008 maw@suse.de
* Fri Mar 14 2008 maw@suse.de
- Update to version 2.22.0:
+ Bigs fixed: bnc#282466, bgo#351672m and bgo#520745
+ Updated translations.
@ -746,7 +771,7 @@ fi
bnc-308959-mail-attachment-icon.patch,
evolution-stringcompare.patch, and
bnc-302017-print-100pc.diff.
* Tue Dec 04 2007 maw@suse.de
* Wed Dec 05 2007 maw@suse.de
- Build with openldap2-devel, not openldap2.
* Tue Nov 13 2007 psankar@suse.de
- bnc-308959-mail-attachment-icon.patch: Fixes mail attachment icon
@ -1097,7 +1122,7 @@ fi
* Thu Mar 22 2007 maw@suse.de
- Update to version 2.10.0
- Update the required intltool version.
* Mon Mar 12 2007 maw@suse.de
* Tue Mar 13 2007 maw@suse.de
- Update to version 2.9.91
- Remove upstreamed bnc-214647-add-prefer-plain-plugin.patch
- fix-security-gtkhtml-moreui.diff is now much smaller
@ -1109,7 +1134,7 @@ fi
standard libraries, not modules.
* Tue Jan 09 2007 sbrabec@suse.cz
- More spec file cleanups.
* Wed Dec 13 2006 maw@suse.de
* Thu Dec 14 2006 maw@suse.de
- Move to /usr
- Some specfile cleanup.
* Tue Nov 21 2006 vvaradhan@novell.com
@ -1142,7 +1167,7 @@ fi
* Sat Oct 28 2006 kharish@suse.de
- Add bnc-214647-add-prefer-plain-plugin.patch to
include prefer-plain plugin in the build by default.
* Mon Oct 02 2006 jhargadon@suse.de
* Tue Oct 03 2006 jhargadon@suse.de
- update to version 2.8.1
- translation updates
- many bug fixes
@ -1263,7 +1288,7 @@ fi
325960 - Fix to show subscribed and public folders without restarting evolution (Sushma)
- fix-exchange-menuitem.diff: Changed a menu item name in exchange plugin. (Srini)
- fix-sendrecv.diff: Change 'Send Receive' button to 'Get Mail' (Srini)
* Wed Apr 19 2006 fejj@suse.de
* Thu Apr 20 2006 fejj@suse.de
- Added bnc-159736-dbus-restart.patch to the build which replaces
survive-dbus-restarts.patch (it solves the same problem plus more
instances of the same)
@ -1299,7 +1324,7 @@ fi
- Fixes (bnc)
160049 changed G/W password - no calendar prompt ...
158107 No notification of cancelled meetings
* Thu Mar 23 2006 vvaradhan@novell.com
* Fri Mar 24 2006 vvaradhan@novell.com
- Fixes (bnc)
150427 evo 1.6 hang on calendar
153807 msg composer seems to lower instead of raise
@ -1491,18 +1516,18 @@ fi
- Remove upstreamed patches and regenerated new ones
- Remove NM-devel dependency from configure.in and make the code work with
dbus interface itself.
* Fri Feb 17 2006 sreeves@suse.de
* Sat Feb 18 2006 sreeves@suse.de
- Update .desktop file (Name, GenericName, Comment, DocPath)
* Tue Feb 14 2006 aj@suse.de
- Reduce BuildRequires.
- Do not build with NetworkManager.
* Sun Feb 12 2006 ro@suse.de
* Mon Feb 13 2006 ro@suse.de
- silence enough compiler warnings to make it build
* Sun Feb 12 2006 ro@suse.de
* Mon Feb 13 2006 ro@suse.de
- fix compile flags "--fPIC" to "-fPIC"
* Fri Feb 10 2006 vvaradhan@novell.com
- Update to 2.5.90
* Thu Jan 26 2006 mls@suse.de
* Fri Jan 27 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 25 2006 meissner@suse.de
- fixed use of stack-protector in regards to older products/PLUS.
@ -1582,29 +1607,29 @@ fi
- Fixed Send as iCalendar (#72795).
* Tue Mar 15 2005 sbrabec@suse.cz
- Fixed Czech translation.
* Thu Mar 10 2005 gekker@suse.de
* Fri Mar 11 2005 gekker@suse.de
- Add Email to %%suse_update_desktop_file (65804).
* Tue Mar 08 2005 gekker@suse.de
* Wed Mar 09 2005 gekker@suse.de
- Update to version 2.2.0 (GNOME 2.10).
* Wed Mar 02 2005 gekker@suse.de
- Update to version 2.1.6
* Wed Feb 09 2005 gekker@suse.de
* Thu Feb 10 2005 gekker@suse.de
- Update to version 2.1.5
* Sat Feb 05 2005 gekker@suse.de
-Update to version 2.1.4
* Thu Jan 20 2005 ro@suse.de
* Fri Jan 21 2005 ro@suse.de
- fixed file list
* Sat Jan 15 2005 clahey@suse.de
- Updated to version 2.1.3.
* Mon Jan 10 2005 ro@suse.de
* Tue Jan 11 2005 ro@suse.de
- added directories to filelist
* Fri Jan 07 2005 gekker@suse.de
- Update to version 2.1.2
* Tue Dec 07 2004 gekker@suse.de
- update to version 2.0.3 (Ximian 70057)
* Mon Nov 29 2004 ro@suse.de
* Tue Nov 30 2004 ro@suse.de
- adapted evolution-2.0.1-de-po.patch
* Mon Nov 29 2004 gekker@suse.de
* Tue Nov 30 2004 gekker@suse.de
- Update version to 2.0.2
- Remove patches that are upstream
- Change the no-groupwise-docs patch to actually apply
@ -1615,9 +1640,9 @@ fi
* Thu Oct 07 2004 dobey@suse.de
- Update default Inbox patch to not mention Groupwise support
http://bugzilla.ximian.com/show_bugs.cgi?id=67643
* Mon Oct 04 2004 dobey@suse.de
* Tue Oct 05 2004 dobey@suse.de
- Add patch to fix bug 67513 in bugzilla.ximian.com
* Wed Sep 29 2004 dobey@suse.de
* Thu Sep 30 2004 dobey@suse.de
- Add patch various bug fixes since 2.0.1
- Add patch to disable groupwise docs
* Tue Sep 28 2004 dobey@suse.de
@ -1625,7 +1650,7 @@ fi
* Mon Sep 27 2004 ke@suse.de
- Fix German translation: keep the "DN" string for Distinguished Name
[#44959].
* Fri Sep 24 2004 dobey@suse.de
* Sat Sep 25 2004 dobey@suse.de
- Update to version 2.0.1
- Add shared-mime-info to Prereq
* Wed Sep 15 2004 dobey@suse.de
@ -1643,16 +1668,16 @@ fi
- Cache evolution help files and show evolution in khelpcenter.
* Wed Aug 18 2004 dobey@suse.de
- Comment out %%debug_package
* Tue Aug 17 2004 dobey@suse.de
* Wed Aug 18 2004 dobey@suse.de
- Add MozillaFirefox libdir to rpath
* Fri Aug 13 2004 dobey@suse.de
* Sat Aug 14 2004 dobey@suse.de
- Update to version 1.5.93
- Split pilot conduits out into evolution-pilot package
- Update dependencies for new versions
- Remove 64-bit patches that are now in CVS
- Remove patch for com_err.h checks as it is in CVS now
- Add patch for default Inbox and Welcome message
* Mon Aug 09 2004 adrian@suse.de
* Tue Aug 10 2004 adrian@suse.de
- move evolution menu entry out of the More menu.
* Mon Aug 09 2004 dobey@suse.de
- Update dependencies to pull in new versions
@ -1668,7 +1693,7 @@ fi
- Add dependencies for spamassassin and other evo packages
* Wed Jul 28 2004 dobey@suse.de
- Updated to version 1.5.91
* Thu Jul 15 2004 clahey@suse.de
* Fri Jul 16 2004 clahey@suse.de
- Updated about box.
* Tue Jul 13 2004 clahey@suse.de
- Updated to version 1.5.90.
@ -1680,7 +1705,7 @@ fi
- Fixed a non-void warning.
* Wed Jun 09 2004 clahey@suse.de
- Updated to version 1.5.9.1. Added SSL. Fixed warnings.
* Thu Jun 03 2004 mibarra@suse.de
* Fri Jun 04 2004 mibarra@suse.de
- Uodated to version 1.5.9
* Thu May 27 2004 mibarra@suse.de
- Enabled default binary at configure time, this means
@ -1688,7 +1713,7 @@ fi
'evolution-1.5'.
* Tue May 25 2004 mibarra@suse.de
- Fixed some 64bits compiler warnings.
* Fri May 21 2004 mibarra@suse.de
* Sat May 22 2004 mibarra@suse.de
- Updated to 1.5.8.
- Added gnome-icon-theme to # neededforbuild
* Tue May 18 2004 clahey@suse.de
@ -1713,7 +1738,7 @@ fi
- Fixed gconf schemas installation (#33114).
* Mon Mar 08 2004 hhetter@suse.de
- updated to version 1.4.6
* Thu Feb 19 2004 ro@suse.de
* Fri Feb 20 2004 ro@suse.de
- use -lpthread with libdb3 where needed
* Fri Jan 09 2004 adrian@suse.de
- remove unneeded %%run_ldconfig
@ -1741,9 +1766,9 @@ fi
- updated to version 1.4.4 (GTK2/GNOME2 ported)
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Sun Jun 29 2003 ro@suse.de
* Mon Jun 30 2003 ro@suse.de
- added directories to filelist
* Wed Jun 04 2003 ro@suse.de
* Thu Jun 05 2003 ro@suse.de
- remove unpackaged files from buildroot
* Mon Mar 24 2003 hhetter@suse.de
- updated to security bugfix release 1.2.3
@ -1771,11 +1796,11 @@ fi
* Thu Aug 22 2002 hhetter@suse.de
- build with rpath /opt/mozilla/%%_lib to correctly link
wombat (Bug Id#18195)
* Fri Jul 26 2002 adrian@suse.de
* Sat Jul 27 2002 adrian@suse.de
- fix neededforbuild
* Tue Jul 16 2002 hhetter@suse.de
- updated to bugfix release 1.0.8
* Tue Jun 25 2002 ro@suse.de
* Wed Jun 26 2002 ro@suse.de
- build libibex.a with -fPIC, it's linked into a shared library
* Mon Jun 17 2002 jordi@suse.de
- Updated to version 1.0.7
@ -1784,7 +1809,7 @@ fi
* Thu Jun 06 2002 hhetter@suse.de
- more %%_lib fixes
- use new mozilla's libdir
* Wed Jun 05 2002 ro@suse.de
* Thu Jun 06 2002 ro@suse.de
- use libdir
* Tue May 28 2002 hhetter@suse.de
- use new mozilla-nss include paths
@ -1796,7 +1821,7 @@ fi
- update to version 1.0.5
- build and link with db 3.1.17, required by
evolution contacts
* Tue Apr 23 2002 ro@suse.de
* Wed Apr 24 2002 ro@suse.de
- fix build with latest autoconf
(AM_CONDITIONAL must appear in mainline)
* Tue Mar 26 2002 hhetter@suse.de
@ -1805,7 +1830,7 @@ fi
* Mon Feb 18 2002 hhetter@suse.de
- updated to stable bugfix version 1.0.2
- build with automake 1.5 and current db
* Thu Jan 31 2002 ro@suse.de
* Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Wed Jan 30 2002 hhetter@suse.de
- build with db 4.0.14
@ -1817,7 +1842,7 @@ fi
- libtoolize /libical too
- build with db3 again
- build with automake 1.5
* Wed Nov 21 2001 ro@suse.de
* Thu Nov 22 2001 ro@suse.de
- xml-i18n-toolize
* Wed Nov 21 2001 ro@suse.de
- changed neededforbuild <xml-i18n-tools> to <intltool>
@ -1860,7 +1885,7 @@ fi
* Fri Mar 16 2001 egger@suse.de
- Insert extra make to prevent propagation of BuildRoot dirs
into the executable.
* Thu Mar 15 2001 egger@suse.de
* Fri Mar 16 2001 egger@suse.de
- Updated to version 0.9.
* Wed Mar 14 2001 ro@suse.de
- added xf86 to neededforbuild
@ -1871,23 +1896,23 @@ fi
- First version that works with SuSE, yay!
* Thu Nov 09 2000 ro@suse.de
- fixed neededforbuild again
* Wed Nov 08 2000 ro@suse.de
* Thu Nov 09 2000 ro@suse.de
- typo fixed
* Wed Nov 08 2000 ro@suse.de
- fixed neededforbuild
* Tue Oct 31 2000 egger@suse.de
* Wed Nov 01 2000 egger@suse.de
- Updated specfile to new long packagenames.
- Reworked specfile.
- Probably needs some more work; I'm taking care of that.
* Sun Oct 01 2000 egger@suse.de
* Mon Oct 02 2000 egger@suse.de
- Fixed it a little more....
* Mon Sep 25 2000 egger@suse.de
- Removed a thinko....
* Sun Sep 24 2000 egger@suse.de
* Mon Sep 25 2000 egger@suse.de
- Restructuring of the package.
- Use the splitted packages oafdev and bonobod.
- Buildproofed on i386.
* Thu Sep 21 2000 egger@suse.de
* Fri Sep 22 2000 egger@suse.de
- Use BuildRoot.
- Buildproofed on i386.
* Tue Sep 19 2000 egger@suse.de