OBS User autobuild 2009-08-21 15:25:12 +00:00 committed by Git OBS Bridge
parent bef2a5f632
commit 38bef33c81
4 changed files with 3 additions and 43 deletions

View File

@ -1,22 +0,0 @@
From cd82d46430e589998462313fd3642134cf052a38 Mon Sep 17 00:00:00 2001
From: G<>tz Waschk <waschk@mandriva.org>
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

1
evolution-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter(".*devel-file-in-non-devel-package.*/usr/lib/evolution/.*.so.*")

View File

@ -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

View File

@ -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)