rpms/kdeedu/F-8 kdeedu.spec,1.63,1.64

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Apr 9 15:56:42 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29342

Modified Files:
	kdeedu.spec 
Log Message:
* Wed Apr 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-3
- -libs: omit multilib Obsoletes hack (#435956)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-8/kdeedu.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdeedu.spec	22 Mar 2008 06:34:20 -0000	1.63
+++ kdeedu.spec	9 Apr 2008 15:55:59 -0000	1.64
@@ -90,10 +90,8 @@
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -127,7 +125,8 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=%{_includedir}/kde
+   --includedir=%{_includedir}/kde \
+   %{?with_facile:--enable-ocamlsolver} %{!with_facile:--disable-ocamlsolver}
 
 make %{?_smp_mflags}
 
@@ -222,6 +221,9 @@
 
 
 %changelog
+* Wed Apr 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-3
+- -libs: omit multilib Obsoletes hack (#435956)
+
 * Sat Mar 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-2
 - BR ocaml(compiler) and ocaml-facile-devel on F8 !ppc64 (for Kalzium)
 




More information about the scm-commits mailing list