Author: paladine Date: Wed Mar 9 22:22:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to 1.2.0
---- Files affected: SPECS: evolution-data-server.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.37 SPECS/evolution-data-server.spec:1.38 --- SPECS/evolution-data-server.spec:1.37 Sat Feb 19 10:21:33 2005 +++ SPECS/evolution-data-server.spec Wed Mar 9 23:22:17 2005 @@ -3,31 +3,35 @@ # todo: # - system libical # -%define mver 1.0 +%define mver 1.2 Summary: Evolution data server Summary(pl): Serwer danych Evolution Name: evolution-data-server -Version: 1.0.4 +Version: 1.2.0 Release: 1 License: GPL Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 -# Source0-md5: 5c9c6cac9b65d392e50ea3214022cb5b +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.2/%{name}-%{version}.tar.bz2 +# Source0-md5: 9a34499dc8e65af768ab1582803015ef Patch0: %{name}-system_db.patch Patch1: %{name}-GG-IM.patch Patch2: %{name}-workaround-cal-backend-leak.patch +Patch3: %{name}-bonobo.patch URL: http://www.ximian.com/products/ximian_evolution/ -BuildRequires: ORBit2-devel >= 1:2.10.3 +BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: db-devel BuildRequires: gnome-common >= 2.8.0 BuildRequires: intltool -BuildRequires: libgnome-devel >= 2.6.1.1 +BuildRequires: libglade2-devel >= 1:2.5.0 +BuildRequires: libgnomeui-devel >= 2.10.0 BuildRequires: libsoup-devel >= 2.2.2 BuildRequires: libstdc++-devel BuildRequires: libtool +BuildRequires: nspr-devel +Buildrequires: nss-devel BuildRequires: openldap-devel BuildRequires: pkgconfig Requires(post,postun): /sbin/ldconfig @@ -48,11 +52,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} # for all but libegroupwise -Requires: GConf2-devel >= 2.6.2 -Requires: ORBit2-devel >= 1:2.10.3 -Requires: glib2-devel >= 1:2.4.4 -Requires: libbonobo-devel >= 2.6.2 -Requires: libgnome-devel >= 2.6.1.1 +Requires: GConf2-devel >= 2.10.0 +Requires: ORBit2-devel >= 1:2.12.1 +Requires: glib2-devel >= 1:2.6.2 +Requires: libbonobo-devel >= 2.8.1 +Requires: libgnome-devel >= 2.10.0 Requires: libxml2-devel # for libegroupwise Requires: libsoup-devel >= 2.2.2 @@ -82,6 +86,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 rm -rf libdb @@ -105,8 +110,11 @@ %configure \ --enable-gtk-doc \ --enable-static \ - --with-openldap=yes - + --with-openldap=yes \ + --with-nspr-includes=%{_includedir}/nspr \ + --with-nspr-libs=%{_libdir} \ + --with-nss-includes=%{_includedir}/nss \ + --with-nss-libs=%{_libdir} %{__make} \ HTML_DIR=%{_gtkdocdir} \ GTKHTML_DATADIR=%{_datadir}/idl @@ -120,6 +128,8 @@ HTML_DIR=%{_gtkdocdir} \ pkgconfigdir=%{_pkgconfigdir} +rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{mver}/{camel-providers,extensions}/*.{,l}a + rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no %find_lang %{name} --all-name @@ -139,13 +149,24 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS* README -%attr(755,root,root) %{_libdir}/%{name}-1.0 +%attr(755,root,root) %{_libdir}/camel-index-control-%{mver} +%attr(755,root,root) %{_libdir}/camel-lock-helper-%{mver} %attr(755,root,root) %{_libdir}/*.so.*.* +%dir %{_libdir}/%{name}-%{mver} +%attr(755,root,root) %{_libdir}/%{name}-%{mver}/%{name} +%dir %{_libdir}/%{name}-%{mver}/camel-providers +%attr(755,root,root) %{_libdir}/%{name}-%{mver}/camel-providers/*.so +%{_libdir}/%{name}-%{mver}/camel-providers/*.urls +%dir %{_libdir}/%{name}-%{mver}/extensions +%attr(755,root,root) %{_libdir}/%{name}-%{mver}/extensions/*.so %{_libdir}/bonobo/servers/* %{_datadir}/idl/* %dir %{_datadir}/%{name}-%{mver} +%{_datadir}/%{name}-%{mver}/glade +%{_datadir}/%{name}-%{mver}/weather %{_datadir}/%{name}-%{mver}/zoneinfo %{_datadir}/%{name}-%{mver}/*.schema +%{_pixmapsdir}/%{name}-%{mver} %files devel %defattr(644,root,root,755) @@ -165,9 +186,29 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2005/03/09 22:22:17 paladine +- merged from DEVEL and updated to 1.2.0 + Revision 1.37 2005/02/19 09:21:33 paladine - updated to 1.0.4 - missing BR: libstdc++-devel + +Revision 1.36.2.5 2005/03/01 12:54:30 aflinta +- up to version 1.1.6 + +Revision 1.36.2.4 2005/02/09 11:58:05 grzegol +- remove useless files +- set +x only where it's neccessary + +Revision 1.36.2.3 2005/02/09 11:32:34 wiget +- fix bonobo server location in .server file +- release 2 + +Revision 1.36.2.2 2005/02/08 16:12:22 grzegol +- updated to 1.1.5 + +Revision 1.36.2.1 2005/02/07 16:16:06 grzegol +- updated to 1.1.4.2 Revision 1.36 2004/12/06 23:14:25 grzegol - updated to 1.0.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
