rpms/evolution-data-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add also itermediate changes from f14 branch

Browse Source
This commit is contained in:
Milan Crha 2010-08-30 10:39:51 +02:00
parent 13417b7f35
commit fd55dffced
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
evolution-data-server-2.31.3-no-gseal.patch
View File

@ -1,11 +0,0 @@
diff -up evolution-data-server-2.31.3/configure.ac.no-gseal evolution-data-server-2.31.3/configure.ac
--- evolution-data-server-2.31.3/configure.ac.no-gseal 2010-06-07 16:09:39.000000000 +0200
+++ evolution-data-server-2.31.3/configure.ac 2010-06-07 16:10:05.000000000 +0200
@@ -139,7 +139,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
-DGTK_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
- -DGSEAL_ENABLE
-Wall -Wextra
-Wno-missing-field-initializers
-Wno-sign-compare

14
evolution-data-server.spec
View File

@ -4,8 +4,7 @@
%define nntp_support 1 %define nntp_support 1
%define largefile_support 1 %define largefile_support 1
%define dbus_glib_version 0.6 %define glib2_version 2.25.12
%define glib2_version 2.16.1
%define gtk2_version 2.20.0 %define gtk2_version 2.20.0
%define gtk_doc_version 1.9 %define gtk_doc_version 1.9
%define intltool_version 0.35.5 %define intltool_version 0.35.5
@ -15,7 +14,7 @@
%define soup_version 2.3.0 %define soup_version 2.3.0
%define sqlite_version 3.5 %define sqlite_version 3.5
%define eds_base_version 3.0 %define eds_base_version 2.32
%define use_gnome_keyring 1 %define use_gnome_keyring 1
@ -42,15 +41,11 @@ Obsoletes: evolution-webcal < 2.24.0
# RH bug #243296 # RH bug #243296
Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# no-gseal because of gdk functions for now
Patch12: evolution-data-server-2.31.3-no-gseal.patch
### Build Dependencies ### ### Build Dependencies ###
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: db4-devel BuildRequires: db4-devel
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: gettext BuildRequires: gettext
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gnome-common BuildRequires: gnome-common
@ -123,7 +118,6 @@ This package contains developer documentation for %{name}.
%setup -q %setup -q
%patch11 -p1 -b .fix-64bit-acinclude %patch11 -p1 -b .fix-64bit-acinclude
%patch12 -p1 -b .no-gseal
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -340,6 +334,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Aug 30 2010 Milan Crha <mcrha@redhat.com> - 2.31.91-1.fc15 * Mon Aug 30 2010 Milan Crha <mcrha@redhat.com> - 2.31.91-1.fc15
- Update to 2.31.91 - Update to 2.31.91
- Resume GSEAL usage.
- Drop dbus-glib requirement.
- Bump glib2 requirement to 2.25.12.
- Roll back eds_base_version to 2.32.
* Tue Jul 13 2010 Milan Crha <mcrha@redhat.com> - 2.31.5-1.fc14 * Tue Jul 13 2010 Milan Crha <mcrha@redhat.com> - 2.31.5-1.fc14
- Update to 2.31.5 - Update to 2.31.5