From a3f89e3fe7e94ae3a26bfc89d2d8dca6a96587a8e7d26b014e1381f489363759 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 28 Aug 2009 08:52:12 +0000 Subject: [PATCH 1/4] Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 18680 Request was accepted with message: OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=46 --- bgo591414-no-module.patch | 22 ---------------------- evolution-2.27.90.tar.bz2 | 3 --- evolution-2.27.91.tar.bz2 | 3 +++ evolution.changes | 17 +++++++++++++++++ evolution.spec | 9 +++------ 5 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 bgo591414-no-module.patch delete mode 100644 evolution-2.27.90.tar.bz2 create mode 100644 evolution-2.27.91.tar.bz2 diff --git a/bgo591414-no-module.patch b/bgo591414-no-module.patch deleted file mode 100644 index b70a65e..0000000 --- a/bgo591414-no-module.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cd82d46430e589998462313fd3642134cf052a38 Mon Sep 17 00:00:00 2001 -From: G�tz Waschk -Date: Tue, 11 Aug 2009 10:42:43 +0000 -Subject: Bug 591414 - libevolution-cal-shared is linked as a module - ---- -diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am -index 86d4d6d..853cfce 100644 ---- a/calendar/gui/Makefile.am -+++ b/calendar/gui/Makefile.am -@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - --libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) - - - libevolution_calendar_la_LIBADD = \ --- -cgit v0.8.2 - diff --git a/evolution-2.27.90.tar.bz2 b/evolution-2.27.90.tar.bz2 deleted file mode 100644 index 7a7936c..0000000 --- a/evolution-2.27.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6bbc95c8f5854aca307b84c822b77ff19f75ff6035acb2f72e97cba60a43c17 -size 37862560 diff --git a/evolution-2.27.91.tar.bz2 b/evolution-2.27.91.tar.bz2 new file mode 100644 index 0000000..9645d6a --- /dev/null +++ b/evolution-2.27.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cd67e231afd692dc35d3c2ab8459cf6400659326c2e6f1c4f44e62e5a414238 +size 38183469 diff --git a/evolution.changes b/evolution.changes index 5a574f0..b5083ed 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 24 19:51:03 CEST 2009 - dimstar@opensuse.org + +- Update to version 2.27.91: + + Calendar: + - bgo#591414 - libevolution-cal-shared is linked as a module + + Miscellaneous: + - bgo#591321 - Cosmetic changes and fixes in configure.ac + - bgo#591326 - Keep m4 macros in their own folder + - bgo#591377 - Fails to detect krb5 in configure with -as-needed + - bgo#592680 - Remove deprecated Encoding key from desktop file + + Other Fixes: + - Fix msgfmt check by setting strings to fuzzy + - Update czech screenshots. + + Updated translations. +- Drop bgo591414-no-module.patch, upstream included. + ------------------------------------------------------------------- Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 2e332c1..9f0b36c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.27.90) +# spec file for package evolution (Version 2.27.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -59,8 +59,8 @@ License: LGPL v2.0 only ; LGPL v3 only 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.28 -Version: 2.27.90 -Release: 2 +Version: 2.27.91 +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-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number @@ -94,8 +94,6 @@ Patch54: bnc-445996-address-conflict.patch Patch101: sp-process-meetings.diff # PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed Patch102: evolution-as-needed.patch -# PATCH-FIX-UPSTREAM bgo591414-no-module.patch bgo#591414 dimstar@opensuse.org -- Do not build libevolution-cal-shared as module -Patch103: bgo591414-no-module.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: bogofilter @@ -184,7 +182,6 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 -%patch103 -p1 #gnome-patch-translation-update %build From 0cb7b18fd19d414feb0c194241f7c1dc6e3c7e2647235bf020c0b0b823a6b125 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 28 Aug 2009 08:53:37 +0000 Subject: [PATCH 2/4] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=47 --- evolution.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.changes b/evolution.changes index b5083ed..793682f 100644 --- a/evolution.changes +++ b/evolution.changes @@ -7,7 +7,8 @@ Mon Aug 24 19:51:03 CEST 2009 - dimstar@opensuse.org + Miscellaneous: - bgo#591321 - Cosmetic changes and fixes in configure.ac - bgo#591326 - Keep m4 macros in their own folder - - bgo#591377 - Fails to detect krb5 in configure with -as-needed + - bgo#591377 - Fails to detect krb5 in configure with + -as-needed - bgo#592680 - Remove deprecated Encoding key from desktop file + Other Fixes: - Fix msgfmt check by setting strings to fuzzy From 57869ecdd4b29b37487390922febc4cf629640b001ed30a9011b399d007f7003 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 3 Sep 2009 15:40:34 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=48 --- bgo591414-no-module.patch | 22 ++++++++++++++++++++++ evolution-2.27.90.tar.bz2 | 3 +++ evolution-2.27.91.tar.bz2 | 3 --- evolution.changes | 18 ------------------ evolution.spec | 9 ++++++--- 5 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 bgo591414-no-module.patch create mode 100644 evolution-2.27.90.tar.bz2 delete mode 100644 evolution-2.27.91.tar.bz2 diff --git a/bgo591414-no-module.patch b/bgo591414-no-module.patch new file mode 100644 index 0000000..b70a65e --- /dev/null +++ b/bgo591414-no-module.patch @@ -0,0 +1,22 @@ +From cd82d46430e589998462313fd3642134cf052a38 Mon Sep 17 00:00:00 2001 +From: G�tz Waschk +Date: Tue, 11 Aug 2009 10:42:43 +0000 +Subject: Bug 591414 - libevolution-cal-shared is linked as a module + +--- +diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am +index 86d4d6d..853cfce 100644 +--- a/calendar/gui/Makefile.am ++++ b/calendar/gui/Makefile.am +@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = \ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + +-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) + + + libevolution_calendar_la_LIBADD = \ +-- +cgit v0.8.2 + diff --git a/evolution-2.27.90.tar.bz2 b/evolution-2.27.90.tar.bz2 new file mode 100644 index 0000000..7a7936c --- /dev/null +++ b/evolution-2.27.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6bbc95c8f5854aca307b84c822b77ff19f75ff6035acb2f72e97cba60a43c17 +size 37862560 diff --git a/evolution-2.27.91.tar.bz2 b/evolution-2.27.91.tar.bz2 deleted file mode 100644 index 9645d6a..0000000 --- a/evolution-2.27.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cd67e231afd692dc35d3c2ab8459cf6400659326c2e6f1c4f44e62e5a414238 -size 38183469 diff --git a/evolution.changes b/evolution.changes index 793682f..5a574f0 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 24 19:51:03 CEST 2009 - dimstar@opensuse.org - -- Update to version 2.27.91: - + Calendar: - - bgo#591414 - libevolution-cal-shared is linked as a module - + Miscellaneous: - - bgo#591321 - Cosmetic changes and fixes in configure.ac - - bgo#591326 - Keep m4 macros in their own folder - - bgo#591377 - Fails to detect krb5 in configure with - -as-needed - - bgo#592680 - Remove deprecated Encoding key from desktop file - + Other Fixes: - - Fix msgfmt check by setting strings to fuzzy - - Update czech screenshots. - + Updated translations. -- Drop bgo591414-no-module.patch, upstream included. - ------------------------------------------------------------------- Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 9f0b36c..2e332c1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.27.91) +# spec file for package evolution (Version 2.27.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -59,8 +59,8 @@ License: LGPL v2.0 only ; LGPL v3 only 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.28 -Version: 2.27.91 -Release: 1 +Version: 2.27.90 +Release: 2 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-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number @@ -94,6 +94,8 @@ Patch54: bnc-445996-address-conflict.patch Patch101: sp-process-meetings.diff # PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed Patch102: evolution-as-needed.patch +# PATCH-FIX-UPSTREAM bgo591414-no-module.patch bgo#591414 dimstar@opensuse.org -- Do not build libevolution-cal-shared as module +Patch103: bgo591414-no-module.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: bogofilter @@ -182,6 +184,7 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 +%patch103 -p1 #gnome-patch-translation-update %build From 33db5e1862ba87f726a5ef68b7f9d61a3eff454d3e896a7d8bd1a13cc95bc39f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 3 Sep 2009 15:40:35 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/evolution revision 72.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=910cf3bb3f8ed21d7921a7f0224cf770 --- bgo591414-no-module.patch | 22 ---------------------- evolution-2.27.90.tar.bz2 | 3 --- evolution-2.27.91.tar.bz2 | 3 +++ evolution.changes | 18 ++++++++++++++++++ evolution.spec | 9 +++------ 5 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 bgo591414-no-module.patch delete mode 100644 evolution-2.27.90.tar.bz2 create mode 100644 evolution-2.27.91.tar.bz2 diff --git a/bgo591414-no-module.patch b/bgo591414-no-module.patch deleted file mode 100644 index b70a65e..0000000 --- a/bgo591414-no-module.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cd82d46430e589998462313fd3642134cf052a38 Mon Sep 17 00:00:00 2001 -From: G�tz Waschk -Date: Tue, 11 Aug 2009 10:42:43 +0000 -Subject: Bug 591414 - libevolution-cal-shared is linked as a module - ---- -diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am -index 86d4d6d..853cfce 100644 ---- a/calendar/gui/Makefile.am -+++ b/calendar/gui/Makefile.am -@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - --libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) - - - libevolution_calendar_la_LIBADD = \ --- -cgit v0.8.2 - diff --git a/evolution-2.27.90.tar.bz2 b/evolution-2.27.90.tar.bz2 deleted file mode 100644 index 7a7936c..0000000 --- a/evolution-2.27.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6bbc95c8f5854aca307b84c822b77ff19f75ff6035acb2f72e97cba60a43c17 -size 37862560 diff --git a/evolution-2.27.91.tar.bz2 b/evolution-2.27.91.tar.bz2 new file mode 100644 index 0000000..9645d6a --- /dev/null +++ b/evolution-2.27.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cd67e231afd692dc35d3c2ab8459cf6400659326c2e6f1c4f44e62e5a414238 +size 38183469 diff --git a/evolution.changes b/evolution.changes index 5a574f0..793682f 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Aug 24 19:51:03 CEST 2009 - dimstar@opensuse.org + +- Update to version 2.27.91: + + Calendar: + - bgo#591414 - libevolution-cal-shared is linked as a module + + Miscellaneous: + - bgo#591321 - Cosmetic changes and fixes in configure.ac + - bgo#591326 - Keep m4 macros in their own folder + - bgo#591377 - Fails to detect krb5 in configure with + -as-needed + - bgo#592680 - Remove deprecated Encoding key from desktop file + + Other Fixes: + - Fix msgfmt check by setting strings to fuzzy + - Update czech screenshots. + + Updated translations. +- Drop bgo591414-no-module.patch, upstream included. + ------------------------------------------------------------------- Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 2e332c1..9f0b36c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.27.90) +# spec file for package evolution (Version 2.27.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -59,8 +59,8 @@ License: LGPL v2.0 only ; LGPL v3 only 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.28 -Version: 2.27.90 -Release: 2 +Version: 2.27.91 +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-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number @@ -94,8 +94,6 @@ Patch54: bnc-445996-address-conflict.patch Patch101: sp-process-meetings.diff # PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed Patch102: evolution-as-needed.patch -# PATCH-FIX-UPSTREAM bgo591414-no-module.patch bgo#591414 dimstar@opensuse.org -- Do not build libevolution-cal-shared as module -Patch103: bgo591414-no-module.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: bogofilter @@ -184,7 +182,6 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 -%patch103 -p1 #gnome-patch-translation-update %build