Author: glen Date: Tue Jan 3 13:48:04 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- R: heimdal-devel for -devel when kerberos5 bcond is on
- sorted preambles
---- Files affected:
SPECS:
evolution-data-server.spec (1.69 -> 1.70)
---- Diffs:
================================================================
Index: SPECS/evolution-data-server.spec
diff -u SPECS/evolution-data-server.spec:1.69
SPECS/evolution-data-server.spec:1.70
--- SPECS/evolution-data-server.spec:1.69 Fri Dec 30 17:11:40 2005
+++ SPECS/evolution-data-server.spec Tue Jan 3 14:47:58 2006
@@ -30,6 +30,7 @@
BuildRequires: bison
BuildRequires: db-devel
BuildRequires: gnome-common >= 2.8.0
+%{?with_kerberos5:BuildRequires: heimdal-devel >= 0.7}
BuildRequires: howl-devel >= 0.9.10
BuildRequires: intltool
BuildRequires: libglade2-devel >= 1:2.5.1
@@ -39,10 +40,9 @@
BuildRequires: libtool
BuildRequires: nspr-devel
BuildRequires: nss-devel
+%{?with_ldap:BuildRequires: openldap-devel >= 2.0.0}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.197
-%{?with_kerberos5:BuildRequires: heimdal-devel >= 0.7}
-%{?with_ldap:BuildRequires: openldap-devel >= 2.0.0}
Requires(post,postun): scrollkeeper
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -85,6 +85,7 @@
Summary(pl): Pliki programistyczne serwera danych evolution
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+%{?with_kerberos5:Requires: heimdal-devel >= 0.7}
# for all but libegroupwise
Requires: GConf2-devel >= 2.10.0
Requires: ORBit2-devel >= 1:2.12.1
@@ -116,7 +117,7 @@
Statyczne biblioteki serwera danych Evolution.
%prep
-%setup -q
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -155,7 +156,7 @@
--with-nss-libs=%{_libdir}
%{__make} \
HTML_DIR=%{_gtkdocdir} \
- GTKHTML_DATADIR=%{_datadir}/idl
+ GTKHTML_DATADIR=%{_datadir}/idl
%install
rm -rf $RPM_BUILD_ROOT
@@ -265,6 +266,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2006/01/03 13:47:58 glen
+- R: heimdal-devel for -devel when kerberos5 bcond is on
+- sorted preambles
+
Revision 1.69 2005/12/30 16:11:40 patrys
- unkloczkized the commit log (en_TK -> en_US)
- STBR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
