checked in

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

bnc-435668-hide-accept.patch

@@ -2,7 +2,7 @@ Index: plugins/itip-formatter/itip-formatter.c
 ===================================================================
 --- plugins/itip-formatter/itip-formatter.c.orig
 +++ plugins/itip-formatter/itip-formatter.c
-@@ -2115,6 +2115,14 @@ in_proper_folder (CamelFolder *folder)
+@@ -2112,6 +2112,14 @@ in_proper_folder (CamelFolder *folder)
  	if (!folder)
  		return res;
  
@@ -16,4 +16,4 @@ Index: plugins/itip-formatter/itip-formatter.c
 +
  	uri = mail_tools_folder_to_url (folder);
  
- 	if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (),
+ 	if (mail_folder_cache_get_folder_info_flags (folder, &flags)) {

evolution-2.29.3.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a22483241e8098014d7888a5332ecfa7014fc5980a370116d932ccc1cc49cfb
+size 38204222

evolution-2.29.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2452e43e377d60d8bfe7bdb1c076b1010e7e6f4b708703e64f0f576bc9e06839
-size 29653760

evolution-eds2.29.3.patch

@@ -0,0 +1,13 @@
+Index: evolution-2.29.3.1/configure.ac
+===================================================================
+--- evolution-2.29.3.1.orig/configure.ac
++++ evolution-2.29.3.1/configure.ac
+@@ -43,7 +43,7 @@ GTKHTML_PACKAGE=3.14
+ dnl Required Packages
+ m4_define([glib_minimum_version], [2.20.0])
+ m4_define([gtk_minimum_version], [2.16.0])
+-m4_define([eds_minimum_version], [evo_version])
++m4_define([eds_minimum_version], [2.29.3])
+ m4_define([gnome_icon_theme_minimum_version], [2.19.91])
+ m4_define([gnome_desktop_minimum_version], [2.26.0])
+ m4_define([libgtkhtml_minimum_version], [3.29.2])

evolution.changes

@@ -1,91 +1,3 @@
--------------------------------------------------------------------
-Sun Dec 27 15:50:12 CET 2009 - vuntz@opensuse.org
-
-- Rework packaging to make it easy to switch between using evoldap
-  and not using it, with a USE_EVOLDAP define.
-- Do not use evoldap right now: the evoldap package doesn't seem to
-  be well-maintained.
-- Call suse_update_desktop_file on evolution-alarm-notify.
-- Add libgnomecanvas-devel Requires to devel package.
-- Remove scrollkeeper BuildRequires.
-
--------------------------------------------------------------------
-Thu Dec 24 21:15:16 CET 2009 - vuntz@opensuse.org
-
-- Create python-plugins subpackage, and pass --enable-python to
-  configure to enable the python plugins.
-- Add supplements on mono-plugins and python-plugins so that those
-  subpackages get automatically installed if evolution and mono or
-  python are installed.
-- Fix Requires on evolution to not use the release version number.
-- Add gconf2-devel, gtk2-devel Requires to devel package.
-- Remove gail-devel, libgweather-devel, libnotify-devel,
-  libopenssl-devel Requires from devel package.
-
--------------------------------------------------------------------
-Thu Dec 24 18:43:18 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.29.4:
-  + Mailer:
-    - bgo#596967 - Per-folder setting for threading and preview
-                   panel
-    - bgo#604884 - Use proper colors in Search bar when is search
-                   activated
-    - bgo#593896 - "Search -> Find now" should not be always
-                   enabled
-    - bgo#593700 - Restore folder's last selected message as
-                   expected
-    - bgo#603184 - Various problems with search box in folders
-    - bgo#604761 - Select certificate doesn't work
-    - bgo#553057 - Show signer's information in a message
-                   window/preview
-    - bgo#602505 - Incorrect information in message window
-    - bgo#551464 - Paste files into composer as attachments
-  + Calendar:
-    - bgo#596947 - Calendar view forgets memo pane height
-    - bgo#359755 - Do not fetch content of a CalDAV calendar when
-                   given it
-    - bgo#604512 - Calendar publishing tab misses button label
-    - bgo#604182 - Do not block UI with publish-calendar messages
-    - bgo#359755 - Support for CalDAV collections
-    - bgo#603682 - Duplicate mnemonic in meeting window
-    - bgo#603061 - Use .ics for temp vcalendar files
-  + Contacts:
-    - bgo#602998 - Contacts searches are supposed to be per address
-                   book
-  + Misc:
-    - bgo#604838 - Drop unused alert dialog
-    - bgo#604822 - Drop more alert titles. Drop all alert titles to
-                   be found in *.error.xml.
-    - bgo#603701 - Don't treat 4 byte values as DDWORDs
-    - bgo#603342 - Memory leak fixes
-    - bgo#604562 - Typo in gconf schema
-    - bgo#604182 - Hide variable used only with HAVE_LIBNOTIFY
-    - bgo#499322 - Use extension for "Save as" suggested file name
-    - bgo#603972 - Proper title for dialog
-    - bgo#591938 - Update translator's comments
-    - bgo#604098 - Missing \n in EAlert
-    - bgo#603592 - X11 window roles should be set
-    - bgo#602963 - Migrate to new EError Apis
-  + Misc Fixes
-    - Punctuation fixes
-    - EShellContent cleanups.
-    - Fix distcheck errors.
-    - Fix a small memory leak in EShellBackend
-    - Add get_data_dir(), get_config_dir() vfuncs to EShellBackend
-    - Merge some composer header changes for Anjal.
-    - Introduce EMailBackend into libevolution-mail.
-    - Use the boxed CamelObject type for signal params in
-      MailFolderCache
-    - Remove mail-config, vfolder, and filter deps from
-      mail-folder-cache
-    - Kill ETableScrolled.
-    - Bump glib requirement to 2.22.0
-    - Remove libhal requirement from configure
-  + Updated translations.
-- Drop evolution-eds2.29.3.patch: not needed anymore.
-- Update bnc-435668-hide-accept.patch to apply without fuzz.
-
 -------------------------------------------------------------------
 Fri Dec  4 11:03:34 CET 2009 - dimstar@opensuse.org
 

evolution.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.29.4)
+# spec file for package evolution (Version 2.29.3.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,12 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define USE_EVOLDAP 0
+# norootforbuild
+
 
 Name:           evolution
 BuildRequires:  NetworkManager-devel
 BuildRequires:  bison
-%if %USE_EVOLDAP
+%if %suse_version > 1100
 BuildRequires:  evoldap2-devel
 %else
 BuildRequires:  openldap2-devel
@@ -51,6 +52,7 @@ BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pilot-link
 BuildRequires:  psmisc
 BuildRequires:  python-devel
+BuildRequires:  scrollkeeper
 BuildRequires:  shared-mime-info
 BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
@@ -59,10 +61,12 @@ License:        LGPLv2.0 ; LGPLv3
 Group:          Productivity/Networking/Email/Clients
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 2.30
-Version:        2.29.4
+Version:        2.29.3.1
 Release:        1
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM evolution-eds2.29.3.patch dimstar@opensuse.org -- e-d-s 2.29.3.1 was never released / tagged.
+Patch0:         evolution-eds2.29.3.patch
 # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
 Patch7:         calendar-sendbutton.patch
 # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
@@ -109,13 +113,14 @@ Evolution or embed the existing ones in other applications.
 License:        LGPLv2.0 ; LGPLv3
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
-Requires:       evolution = %{version}
+Requires:       evolution = %{?epoch:}%{version}-%{release}
 Requires:       evolution-data-server-devel
-Requires:       gconf2-devel
+Requires:       gail-devel
 Requires:       gnome-desktop-devel
-Requires:       gtk2-devel
 Requires:       gtkhtml2-devel
-Requires:       libgnomecanvas-devel
+Requires:       libgweather-devel >= 2.25.4
+Requires:       libnotify-devel
+Requires:       libopenssl-devel
 Requires:       libunique-devel
 Requires:       libxml2-devel
 Provides:       evolution2-devel = %{version}
@@ -129,7 +134,7 @@ to develop applications that require these.
 License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
 Summary:        The Integrated GNOME Mail, Calendar, and Addressbook Suite
 Group:          Productivity/Networking/Email/Clients
-Requires:       evolution = %{version}
+Requires:       evolution = %{?epoch:}%{version}-%{release}
 
 %description pilot
 Evolution consists of modular components (at the moment: mailer,
@@ -141,8 +146,7 @@ embed the existing ones in other applications.
 License:        LGPLv2.0 ; LGPLv3
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Group:          Productivity/Networking/Email/Clients
-Requires:       evolution = %{version}
+Requires:       evolution = %{?epoch:}%{version}-%{release}
-Supplements:    packageand(evolution:mono-core)
 # Dice support is disabled
 #BuildRequires:  dice-devel
 BuildRequires:  evolution-sharp
@@ -159,28 +163,14 @@ calendar, and address book) that should make daily life easier. Because
 of the modular design, it is possible to plug new components into
 Evolution or embed the existing ones in other applications.
 
-%package python-plugins
-License:        LGPLv2.0 ; LGPLv3
-Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
-Group:          Productivity/Networking/Email/Clients
-Requires:       evolution = %{version}
-Supplements:    packageand(evolution:python)
-
-%description python-plugins
-Evolution consists of modular components (at the moment: mailer,
-calendar, and address book) that should make daily life easier. Because
-of the modular design, it is possible to plug new components into
-Evolution or embed the existing ones in other applications.
-
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
 #gnome-patch-translation-prepare
+%patch0 -p1
 # %patch7
-%if %USE_EVOLDAP
 %patch15 -p1
-%endif
 %patch16 -p1
 %patch18
 %patch19
@@ -206,7 +196,7 @@ autoreconf -f -i
 %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
 %{configure} \
     --disable-scrollkeeper \
-%if %USE_EVOLDAP
+%if %suse_version > 1100
     --with-openldap=%{_libdir}/evoldap \
 %else
     --with-openldap=yes \
@@ -220,7 +210,6 @@ autoreconf -f -i
     --enable-exchange=yes \
     --enable-default-binary=yes \
     --enable-mono=yes \
-    --enable-python=yes \
     --enable-icedesktop=no \
     --disable-static
 # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
@@ -234,22 +223,24 @@ popd
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-find %{buildroot} -name '*.la' -type f -delete -print
+# Remove the libtool archive files
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
 %suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office
-%suse_update_desktop_file evolution-alarm-notify
 %find_lang evolution-%evolution_base_version
 %find_lang evolution evolution-%evolution_base_version.lang
 %find_gconf_schemas
-%{__rm} -r %{buildroot}%{_datadir}/mime-info
+%{__cat} %{name}.schemas_list >%{name}.lst
-%if %USE_EVOLDAP
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info
-  %{__mv} %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin
+%fdupes $RPM_BUILD_ROOT
-  echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > %{buildroot}%{_bindir}/evolution
+%if %suse_version > 1100
-  %{__chmod} +x %{buildroot}%{_bindir}/evolution
+%{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin
+echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_bindir}/evolution
+%{__chmod} +x $RPM_BUILD_ROOT/%{_bindir}/evolution
 %endif
-%fdupes %{buildroot}
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %pre -f %{name}.schemas_pre
 
@@ -267,7 +258,7 @@ if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%files -f %{name}.schemas_list
+%files -f %{name}.lst
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
 %{_bindir}/*
@@ -346,8 +337,4 @@ fi
 #%{_libdir}/evolution/*/plugins/*-sharepoint-*
 #%{_libdir}/evolution/*/plugins/*.dll
 
-%files python-plugins
-%defattr(-,root,root)
-%{_libdir}/evolution/*/modules/*-module-plugin-python.*
-
 %changelog