rpms/evolution/devel evolution.spec, 1.301, 1.302 evolution-2.10.0-e-source-combo-box.patch, 1.6, NONE evolution-2.11.92-icon-names.patch, 1.6, NONE evolution-2.11.92-mail-attachment.patch, 1.1, NONE evolution-2.6.0-prototypes.patch, 1.3, NONE

Matthew Barnes (mbarnes) fedora-extras-commits at redhat.com
Tue Oct 30 16:28:08 UTC 2007 

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15287

Modified Files:
	evolution.spec 
Removed Files:
	evolution-2.10.0-e-source-combo-box.patch 
	evolution-2.11.92-icon-names.patch 
	evolution-2.11.92-mail-attachment.patch 
	evolution-2.6.0-prototypes.patch 
Log Message:

* Tue Oct 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
- Attempt to split the gnome-pilot stuff into a separate
  evolution-conduits subpackage (RH bug #178155).



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- evolution.spec	29 Oct 2007 19:26:25 -0000	1.301
+++ evolution.spec	30 Oct 2007 16:27:34 -0000	1.302
@@ -30,9 +30,9 @@
 %define nm_support 0
 %endif
 %ifarch s390 s390x
-%define pilot_support 0
+%define build_conduits 0
 %else
-%define pilot_support 1
+%define build_conduits 1
 %endif
 %define use_mozilla_nss 1
 
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.21.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -174,7 +174,7 @@
 BuildRequires: openldap-devel >= 2.0.11 
 %endif
 
-%if %{pilot_support} 
+%if %{build_conduits} 
 BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
 # bleah, gnome-pilot really sucks this in, but then I have to have an explicit
 # versioning for gnome-pilot when it changes less than pilot-link itself
@@ -199,13 +199,13 @@
 
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
-communications tool.  The tools which make up Evolution will
-be tightly integrated with one another and act as a seamless
+communications tool.  The components which make up Evolution
+are tightly integrated with one another and act as a seamless
 personal information-management tool.
 
 %package devel
 Group: Development/Libraries
-Summary: Development files for building against evolution
+Summary: Development files for building against %{name}
 Requires: %{name} = %{version}
 Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
@@ -214,15 +214,27 @@
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
 %description devel
-Development files needed for building things which link against evolution.
+Development files needed for building things which link against %{name}.
 
 %package help
 Group: Applications/Productivity
-Summary: Help files for Evolution
+Summary: Help files for %{name}
 Requires: %{name} = %{version}-%{release}
 
 %description help
-This package contains the help for Evolution. 
+This package contains user documentation for %{name}. 
+
+%if %{build_conduits}
+%package conduits
+Group: Applictions/Communications
+Summary: gnome-pilot conduits for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-pilot >= %{gnome_pilot_version}
+
+%description conduits
+The package contains conduits for synchronizing PalmPilot<tm> or other
+PalmOS<tm> devices with %{name}.
+%endif
 
 %prep
 %setup -q -n evolution-%{version}
@@ -261,10 +273,10 @@
 %define ldap_flags --without-openldap
 %endif
 
-%if %{pilot_support}
-%define pilot_flags --enable-pilot-conduits=yes
+%if %{build_conduits}
+%define pilot_flags --enable-pilot-conduits
 %else
-%define pilot_flags --enable-pilot-conduits=no
+%define pilot_flags --disable-pilot-conduits
 %endif
 
 %if %{krb5_support}
@@ -274,9 +286,9 @@
 %endif
 
 %if %{nntp_support}
-%define nntp_flags --enable-nntp=yes
+%define nntp_flags --enable-nntp
 %else
-%define nntp_flags --enable-nntp=no
+%define nntp_flags --disable-nntp
 %endif
 
 %if %{use_mozilla_nss}
@@ -293,9 +305,9 @@
 %endif
 
 %if %{exchange_support}
-%define exchange_flags --enable-exchange=yes
+%define exchange_flags --enable-exchange
 %else
-%define exchange_flags --enable-exchange=no
+%define exchange_flags --disable-exchange
 %endif
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
@@ -486,24 +498,6 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/killev
 
-# Various conduits for gnome-pilot:
-%if %{pilot_support}
-%dir %{_libdir}/evolution/%{evo_major}/conduits
-
-%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-address.conduit
-
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
-
-%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-memo.conduit
-
-%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-todo.conduit
-%endif
-
 # The plugin directory:
 %dir %{evo_plugin_dir}
 
@@ -667,10 +661,30 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %files help -f help.lang
+%defattr(-, root, root)
 %dir %{_datadir}/omf/evolution
 
+%if %{build_conduits}
+%files conduits
+%defattr(-, root, root)
+%dir %{_libdir}/evolution/%{evo_major}/conduits
+%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
+%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
+%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-address.conduit
+%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
+%{_libdir}/gnome-pilot/conduits/e-memo.conduit
+%{_libdir}/gnome-pilot/conduits/e-todo.conduit
+%endif
+
 %changelog
-* Mon Oct 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
+* Tue Oct 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
+- Attempt to split the gnome-pilot stuff into a separate
+  evolution-conduits subpackage (RH bug #178155).
+
+* Mon Oct 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.1-1.fc9
 - Update to 2.21.1
 - Remove redundant requirements.
 - Bump EDS requirement to 2.21.1.


--- evolution-2.10.0-e-source-combo-box.patch DELETED ---


--- evolution-2.11.92-icon-names.patch DELETED ---


--- evolution-2.11.92-mail-attachment.patch DELETED ---


--- evolution-2.6.0-prototypes.patch DELETED ---

More information about the fedora-extras-commits mailing list