Accepting request 27687 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/evolution-data-server via accept of submit request 27687 revision 4. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27687 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=49
This commit is contained in:
parent
0bd195f663
commit
97864513f6
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 27 15:47:54 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.
|
||||
- Remove perl-XML-Parser, sgml-skel BuildRequires.
|
||||
- Remove orbit2-devel Requires of devel package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 24 18:40:54 CET 2009 - vuntz@opensuse.org
|
||||
|
||||
|
@ -15,14 +15,13 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%define USE_EVOLDAP 0
|
||||
|
||||
Name: evolution-data-server
|
||||
%define _evo_version 2.30
|
||||
BuildRequires: bison
|
||||
BuildRequires: db-devel
|
||||
%if %suse_version > 1100
|
||||
%if %USE_EVOLDAP
|
||||
BuildRequires: evoldap2-devel
|
||||
%else
|
||||
BuildRequires: openldap2-devel
|
||||
@ -41,9 +40,7 @@ BuildRequires: libidl-devel
|
||||
BuildRequires: libsoup-devel
|
||||
BuildRequires: mozilla-nss-devel
|
||||
BuildRequires: nss-shared-helper-devel
|
||||
BuildRequires: perl-XML-Parser
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: sgml-skel
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: translation-update-upstream
|
||||
License: GPLv2+
|
||||
@ -68,7 +65,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: %{name}-lang = %{version}
|
||||
Requires: libsoup >= 2.2.6
|
||||
Requires: mozilla-nss
|
||||
%if %suse_version > 1100
|
||||
%if %USE_EVOLDAP
|
||||
Requires: libevoldap-2_4-2
|
||||
%endif
|
||||
Requires: libical0 >= 0.43
|
||||
@ -98,9 +95,8 @@ Requires: libical-devel >= 0.43
|
||||
Requires: libsoup-devel
|
||||
Requires: libxml2-devel
|
||||
Requires: nss-shared-helper-devel
|
||||
Requires: orbit2-devel
|
||||
Requires: sqlite3-devel
|
||||
%if %suse_version > 1100
|
||||
%if %USE_EVOLDAP
|
||||
Requires: evoldap2-devel
|
||||
%else
|
||||
Requires: openldap2-devel
|
||||
@ -138,7 +134,7 @@ translation-update-upstream
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
%{configure} \
|
||||
--libexecdir=%{_libexecdir}/evolution-data-server \
|
||||
%if %suse_version > 1100
|
||||
%if %USE_EVOLDAP
|
||||
--with-openldap=%{_libdir}/evoldap \
|
||||
%else
|
||||
--with-openldap=yes \
|
||||
@ -163,14 +159,20 @@ NOCONFIGURE=1 gnome-autogen.sh
|
||||
%if 0%{?suse_version} <= 1120
|
||||
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
|
||||
%endif
|
||||
# Remove the libtool archive files
|
||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.la
|
||||
find %{buildroot} -name '*.la' -type f -delete -print
|
||||
%find_lang evolution-data-server-%{_evo_version}
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
%if %USE_EVOLDAP
|
||||
for file in %{buildroot}%{_libexecdir}/evolution-data-server/*; do
|
||||
%{__mv} $file $file.bin
|
||||
real_file=`echo $file | sed "s,%{buildroot},,g"`
|
||||
echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"$real_file\" $real_file.bin \"\$@\"" > $file
|
||||
%{__chmod} +x $file
|
||||
done
|
||||
%endif
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%clean
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user