Author: freetz Date: Mon Sep 5 18:23:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to 1.4.0
---- Files affected: SPECS: evolution-data-server.spec (1.55 -> 1.56) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.55 SPECS/evolution-data-server.spec:1.56 --- SPECS/evolution-data-server.spec:1.55 Fri Aug 26 20:20:52 2005 +++ SPECS/evolution-data-server.spec Mon Sep 5 20:23:25 2005 @@ -7,32 +7,33 @@ %bcond_without kerberos5 # build without kerberos5 support %bcond_without ldap # build without ldap support # -%define mver 1.2 +%define basever 1.4 +%define apiver 1.2 Summary: Evolution data server Summary(pl): Serwer danych Evolution Name: evolution-data-server -Version: 1.2.3 -Release: 3 +Version: 1.4.0 +Release: 1 License: GPL Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 067d808957d4b3ac60159f8c8c1358fb +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.4/%{name}-%{version}.tar.bz2 +# Source0-md5: a15991d5f0112b43c18fa99dfccfec1b Patch0: %{name}-system_db.patch Patch1: %{name}-GG-IM.patch Patch2: %{name}-workaround-cal-backend-leak.patch -Patch3: %{name}-bonobo.patch -Patch4: %{name}-gcc4.patch +Patch3: %{name}-gcc4.patch URL: http://www.ximian.com/products/ximian_evolution/ BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf >= 2.52 BuildRequires: automake +BuildRequires: bison BuildRequires: db-devel BuildRequires: gnome-common >= 2.8.0 BuildRequires: howl-devel >= 0.9.10 BuildRequires: intltool BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgnomeui-devel >= 2.10.0-2 -BuildRequires: libsoup-devel >= 2.2.3 +BuildRequires: libgnomeui-devel >= 2.11.2-2 +BuildRequires: libsoup-devel >= 2.2.5 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: nspr-devel @@ -77,10 +78,10 @@ Requires: ORBit2-devel >= 1:2.12.1 Requires: glib2-devel >= 1:2.6.4 Requires: libbonobo-devel >= 2.8.1 -Requires: libgnome-devel >= 2.10.0-2 +Requires: libgnomeui-devel >= 2.11.2-2 Requires: libxml2-devel # for libegroupwise -Requires: libsoup-devel >= 2.2.3 +Requires: libsoup-devel >= 2.2.5 %description devel This package contains the files necessary to develop applications @@ -108,7 +109,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 rm -rf libdb @@ -153,7 +153,7 @@ HTML_DIR=%{_gtkdocdir} \ pkgconfigdir=%{_pkgconfigdir} -rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{mver}/{camel-providers,extensions}/*.{la,a} +rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}/{camel-providers,extensions}/*.{la,a} rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no @@ -204,26 +204,25 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS* README -%attr(755,root,root) %{_libdir}/camel-index-control-%{mver} -%attr(755,root,root) %{_libdir}/camel-lock-helper-%{mver} +%attr(755,root,root) %{_libdir}/camel-index-control-%{apiver} +%attr(755,root,root) %{_libdir}/camel-lock-helper-%{apiver} %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 +%dir %{_libdir}/%{name}-%{apiver} +%dir %{_libdir}/%{name}-%{apiver}/camel-providers +%attr(755,root,root) %{_libdir}/evolution-data-server-%{basever} +%attr(755,root,root) %{_libdir}/%{name}-%{apiver}/camel-providers/*.so +%{_libdir}/%{name}-%{apiver}/camel-providers/*.urls +%dir %{_libdir}/%{name}-%{apiver}/extensions +%attr(755,root,root) %{_libdir}/%{name}-%{apiver}/extensions/*.so %{_libdir}/bonobo/servers/* %{_datadir}/idl/* -%dir %{_datadir}/%{name}-%{mver} -%{_datadir}/%{name}-%{mver}/glade -%{_datadir}/%{name}-%{mver}/weather -%{_datadir}/%{name}-%{mver}/zoneinfo -%if %{with ldap} -%{_datadir}/%{name}-%{mver}/*.schema -%endif -%{_pixmapsdir}/%{name}-%{mver} + +%dir %{_datadir}/%{name}-%{basever} +%{_datadir}/%{name}-%{basever}/glade +%{_datadir}/%{name}-%{basever}/weather +%{_datadir}/%{name}-%{basever}/zoneinfo +%{_datadir}/%{name}-%{basever}/*.schema +%{_pixmapsdir}/%{name}-%{basever} %files -n openldap-schema-evolutionperson %defattr(644,root,root,755) @@ -247,6 +246,45 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2005/09/05 18:23:25 freetz +- merged from DEVEL and updated to 1.4.0 + +Revision 1.50.2.12 2005/08/23 09:22:49 aflinta +- 1.3.8 + +Revision 1.50.2.11 2005/08/21 09:04:10 wiget +- rebuild with new cairo, rel 3 + +Revision 1.50.2.10 2005/08/09 08:58:08 aflinta +- rebuild with libsoup 2.2.5 (soname change), release 2 + +Revision 1.50.2.9 2005/08/08 21:19:00 freetz +- 1.3.7 (new soname!) + +Revision 1.50.2.8 2005/08/01 13:32:01 aflinta +- up to version 1.3.6.1 + +Revision 1.50.2.7 2005/07/26 20:21:15 freetz +- 1.3.6 + +Revision 1.50.2.6 2005/07/23 11:52:26 wiget +- bonobo patch not needed now + +Revision 1.50.2.5 2005/07/13 10:51:55 wiget +- BR heimdal-devel >= 0.7 + +Revision 1.50.2.4 2005/07/12 18:44:54 freetz +- 1.3.5 + +Revision 1.50.2.3 2005/07/12 18:13:48 jpc +- BR: bison + +Revision 1.50.2.2 2005/07/03 16:48:20 freetz +- use apiver/basever macros + +Revision 1.50.2.1 2005/07/03 16:40:03 freetz +- 1.3.4 + Revision 1.55 2005/08/26 18:20:52 qboosh - pl for openldap-schema- @@ -265,41 +303,41 @@ Revision 1.50 2005/06/05 10:16:36 freetz - 1.2.3 -Revision 1.49 2005/04/29 18:48:37 qrczak +Revision %{basever}9 2005/04/29 18:48:37 qrczak - evolution-data-server-gcc4.patch: a static function must have a prototype before it's called - Release 2 -Revision 1.48 2005/04/19 18:45:32 darekr +Revision %{basever}8 2005/04/19 18:45:32 darekr - typo -Revision 1.47 2005/04/13 15:40:27 paladine +Revision %{basever}7 2005/04/13 15:40:27 paladine - updated to 1.2.2 -Revision 1.46 2005/04/12 19:23:21 freetz +Revision %{basever}6 2005/04/12 19:23:21 freetz - reversed ldconfig changes -Revision 1.45 2005/04/08 11:51:53 paladine +Revision %{basever}5 2005/04/08 11:51:53 paladine - new style macros - STBR -Revision 1.44 2005/04/06 00:08:57 paladine +Revision %{basever}4 2005/04/06 00:08:57 paladine - proper R: -Revision 1.43 2005/04/05 23:57:52 paladine +Revision %{basever}3 2005/04/05 23:57:52 paladine - no GConf schemas so no R(post): GConf2 and no running %gconf_schema_install in %%post - run scrollkeeper-update in quiet mode - rel. 3 -Revision 1.42 2005/03/27 22:02:26 qboosh +Revision %{basever}2 2005/03/27 22:02:26 qboosh - unified -Revision 1.41 2005/03/27 08:44:23 averne +Revision %{basever}1 2005/03/27 08:44:23 averne - added kerberos5 and ldap bconds - changes by Mariusz Krynski <[EMAIL PROTECTED]> -Revision 1.40 2005/03/20 18:33:23 aflinta +Revision %{basever}0 2005/03/20 18:33:23 aflinta - rebuild with howl 0.9.10, release 2 Revision 1.39 2005/03/19 03:26:16 wrobell @@ -327,7 +365,7 @@ - updated to 1.1.5 Revision 1.36.2.1 2005/02/07 16:16:06 grzegol -- updated to 1.1.4.2 +- updated to 1.%{basever}.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.55&r2=1.56&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
