rpms/evolution/devel evolution.spec,1.408,1.408.2.1

[Karsten Hopp]

Author: karsten

Update of /cvs/extras/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22929

Modified Files:
      Tag: evolution-2_27_5-3_fc12_rhel6_rebuild
	evolution.spec 
Log Message:
 - fix build requirements for f12 rebuild on s390x, add libeconduit.so.* to
   main package (s390x only)




Index: evolution.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.408
retrieving revision 1.408.2.1
diff -u -p -r1.408 -r1.408.2.1
--- evolution.spec	28 Jul 2009 17:15:44 -0000	1.408
+++ evolution.spec	1 Sep 2009 19:31:48 -0000	1.408.2.1
@@ -25,11 +25,7 @@
 %define libpst_support 1
 %define krb5_support 1
 %define nntp_support 1
-%ifnarch s390 s390x
 %define nm_support 1
-%else
-%define nm_support 0
-%endif
 %ifarch s390 s390x
 %define build_conduits 0
 %else
@@ -43,7 +39,7 @@
 
 Name: evolution
 Version: 2.27.5
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -619,6 +615,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %{evo_plugin_dir}/org-gnome-evolution-webdav.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-webdav.so
+# 
+# we don't have a conduits subpackage on s390*, but libeconduit.so* exists
+%if ! %{build_conduits}
+%{_libdir}/evolution/%{evo_major}/libeconduit.so*
+%endif
 
 %files devel
 %defattr(-, root, root)
@@ -693,6 +694,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 2.27.5-3.1
+- fix build requirements for f12 rebuild on s390x, add libeconduit.so.* to
+  main package (s390x only)
+
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-3.fc12
 - Enable pst-import plugin (RH bug #493049)