From bef2a5f632d15dcdd57ba40258d3d8e51490803c8d9fa91fbaa9af73e2df1e48 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 20 Aug 2009 10:13:21 +0000 Subject: [PATCH 1/3] Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 18339 Request was accepted with message: OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=44 --- bgo591414-no-module.patch | 22 ++++++++++++++++++++++ evolution-rpmlintrc | 1 - evolution.changes | 17 +++++++++++++++++ evolution.spec | 6 ++++-- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 bgo591414-no-module.patch delete mode 100644 evolution-rpmlintrc 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-rpmlintrc b/evolution-rpmlintrc deleted file mode 100644 index 915a865..0000000 --- a/evolution-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(".*devel-file-in-non-devel-package.*/usr/lib/evolution/.*.so.*") diff --git a/evolution.changes b/evolution.changes index 38a50bf..5a574f0 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org + +- Add bgo591414-no-module.patch. Build libevolution-cal-shared as + a proper library including so-version. + +------------------------------------------------------------------- +Wed Aug 19 23:31:35 CEST 2009 - dominique-obs@leuenberger.net + +- Remove rpmlintrc. The files section is now proper and the + tests do not report any false positives. + +------------------------------------------------------------------- +Wed Aug 19 11:34:23 CEST 2009 - dominique-obs@leuenberger.net + +- Move plugins (*.so) from devel package to main package. + ------------------------------------------------------------------- Mon Aug 10 23:39:41 CEST 2009 - dominique-obs@leuenberger.net diff --git a/evolution.spec b/evolution.spec index c2f0c2d..8221c04 100644 --- a/evolution.spec +++ b/evolution.spec @@ -63,7 +63,6 @@ Version: 2.27.90 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 -Source99: evolution-rpmlintrc # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff @@ -95,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 @@ -183,6 +184,7 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 +%patch103 -p1 #gnome-patch-translation-update %build @@ -317,8 +319,8 @@ fi %files devel %defattr(-,root,root) %{_includedir}/* +%{_libdir}/evolution/%{evolution_base_version}/*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/evolution/*/*.so %files pilot %defattr(-,root,root) From 38bef33c818b73f6125abd41bbc7ade369158b8011523fa9fbebb2a2aaca9725 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 21 Aug 2009 15:25:12 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=45 --- bgo591414-no-module.patch | 22 ---------------------- evolution-rpmlintrc | 1 + evolution.changes | 17 ----------------- evolution.spec | 6 ++---- 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 bgo591414-no-module.patch create mode 100644 evolution-rpmlintrc 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-rpmlintrc b/evolution-rpmlintrc new file mode 100644 index 0000000..915a865 --- /dev/null +++ b/evolution-rpmlintrc @@ -0,0 +1 @@ +addFilter(".*devel-file-in-non-devel-package.*/usr/lib/evolution/.*.so.*") diff --git a/evolution.changes b/evolution.changes index 5a574f0..38a50bf 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org - -- Add bgo591414-no-module.patch. Build libevolution-cal-shared as - a proper library including so-version. - -------------------------------------------------------------------- -Wed Aug 19 23:31:35 CEST 2009 - dominique-obs@leuenberger.net - -- Remove rpmlintrc. The files section is now proper and the - tests do not report any false positives. - -------------------------------------------------------------------- -Wed Aug 19 11:34:23 CEST 2009 - dominique-obs@leuenberger.net - -- Move plugins (*.so) from devel package to main package. - ------------------------------------------------------------------- Mon Aug 10 23:39:41 CEST 2009 - dominique-obs@leuenberger.net diff --git a/evolution.spec b/evolution.spec index 8221c04..c2f0c2d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -63,6 +63,7 @@ Version: 2.27.90 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 +Source99: evolution-rpmlintrc # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff @@ -94,8 +95,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 +183,6 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 -%patch103 -p1 #gnome-patch-translation-update %build @@ -319,8 +317,8 @@ fi %files devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/evolution/%{evolution_base_version}/*.so %{_libdir}/pkgconfig/*.pc +%{_libdir}/evolution/*/*.so %files pilot %defattr(-,root,root) From 265e05c429fffb43d54321eab1867a0807e598c9c3c5683cdb4c597dcfd73a96 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 21 Aug 2009 15:25:13 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/evolution revision 71.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=7b1dd91a14ac1e707aa62fe6626b3f10 --- bgo591414-no-module.patch | 22 ++++++++++++++++++++++ evolution-rpmlintrc | 1 - evolution.changes | 17 +++++++++++++++++ evolution.spec | 8 +++++--- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 bgo591414-no-module.patch delete mode 100644 evolution-rpmlintrc 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-rpmlintrc b/evolution-rpmlintrc deleted file mode 100644 index 915a865..0000000 --- a/evolution-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(".*devel-file-in-non-devel-package.*/usr/lib/evolution/.*.so.*") diff --git a/evolution.changes b/evolution.changes index 38a50bf..5a574f0 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Aug 20 11:21:01 CEST 2009 - dimstar@opensuse.org + +- Add bgo591414-no-module.patch. Build libevolution-cal-shared as + a proper library including so-version. + +------------------------------------------------------------------- +Wed Aug 19 23:31:35 CEST 2009 - dominique-obs@leuenberger.net + +- Remove rpmlintrc. The files section is now proper and the + tests do not report any false positives. + +------------------------------------------------------------------- +Wed Aug 19 11:34:23 CEST 2009 - dominique-obs@leuenberger.net + +- Move plugins (*.so) from devel package to main package. + ------------------------------------------------------------------- Mon Aug 10 23:39:41 CEST 2009 - dominique-obs@leuenberger.net diff --git a/evolution.spec b/evolution.spec index c2f0c2d..2e332c1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -60,10 +60,9 @@ 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: 1 +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 -Source99: evolution-rpmlintrc # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff @@ -95,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 @@ -183,6 +184,7 @@ translation-update-upstream #%patch54 %patch101 -p1 %patch102 -p1 +%patch103 -p1 #gnome-patch-translation-update %build @@ -317,8 +319,8 @@ fi %files devel %defattr(-,root,root) %{_includedir}/* +%{_libdir}/evolution/%{evolution_base_version}/*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/evolution/*/*.so %files pilot %defattr(-,root,root)