dep on soprano-2.3.1 for f12+ only (for now):

CVS ----------------------------------------------------------------------
This commit is contained in:
Rex Dieter 2009-11-14 15:50:57 +00:00
parent 03b65c4059
commit e05726247a
1 changed files with 10 additions and 5 deletions

View File

@ -1,7 +1,11 @@
%define phonon_ver 4.3.1
%define soprano_ver 2.3.1
%define soprano_ver 2.3.0
%define strigi_ver 0.7
%if 0%{?fedora} > 11
%define soprano_ver 2.3.1
%endif
Summary: K Desktop Environment 4 - Libraries
Version: 4.3.3
Release: 4%{?dist}
@ -78,7 +82,7 @@ Patch22: kdelibs-4.3.0-bookmarks.patch
Patch24: kdelibs-4.3.1-drkonq.patch
# fix build of fakes.c due to missing #include <string.h>
Patch25: kdelibs-4.3.3-fix-kdefakes-build.patch
# use -fno-var-tracking on khtml/svg bits
# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
# upstream
@ -207,8 +211,9 @@ format for easy browsing.
%patch24 -p1 -b .drkonq
%endif
%patch25 -p1 -b .fix-kdefakes-build
## apply only when doing local builds, helps avoid failures in Rex's box with meager 2gb ram
#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
%if 0%{?fedora} > 11
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
%endif
# upstream patches
%patch50 -p1 -b .kaction_qt_keys
@ -408,7 +413,7 @@ rm -rf %{buildroot}
%changelog
* Fri Nov 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-4
- kubuntu_80_kaction_qt_keys.diff (#475247)
- soprano_ver 2.3.1
- soprano_ver 2.3.1 (f12+)
* Fri Nov 13 2009 Than Ngo <than@redhat.com> - 4.3.3-3
- rhel cleanup, fix conditional for RHEL