rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert to using %_qt4_version macro again 

drop icon-name-qt47 patch
This commit is contained in:
Rex Dieter 2010-07-21 13:57:25 +00:00
parent 6e767d2df9
commit 5448b28270
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kdelibs.spec
View File

@ -1,10 +1,9 @@
%define attica_ver 0.1.4 %define attica_ver 0.1.4
%define phonon_ver 4.4.0 %define phonon_ver 4.4.0
%define qt4_ver 4.7.0-0.25.beta2
%define soprano_ver 2.4.63 %define soprano_ver 2.4.63
%define strigi_ver 0.7.1 %define strigi_ver 0.7.1
%define qt4_ver 4.7.0
# to build/include apidocs or not # to build/include apidocs or not
%define apidocs 1 %define apidocs 1
@ -47,8 +46,6 @@ Requires: shared-mime-info
Requires: soprano%{?_isa} >= %{soprano_version} Requires: soprano%{?_isa} >= %{soprano_version}
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver}) %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
Requires: strigi-libs%{?_isa} >= %{strigi_version} Requires: strigi-libs%{?_isa} >= %{strigi_version}
%global qt4_version %(pkg-config --modversion Qt 2>/dev/null || echo %{qt4_ver})
Requires: qt4%{?_isa} >= %{qt4_version}
# make -devel packages parallel-installable # make -devel packages parallel-installable
Patch0: kdelibs-4.4.85-parallel_devel.patch Patch0: kdelibs-4.4.85-parallel_devel.patch
@ -97,8 +94,9 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
Conflicts: kdebase-workspace-libs < 4.3.80 Conflicts: kdebase-workspace-libs < 4.3.80
%endif %endif
BuildRequires: qt4-devel >= %{qt4_version} BuildRequires: qt4-devel >= %{qt4_ver}
BuildRequires: qt4-webkit-devel BuildRequires: qt4-webkit-devel
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
Requires: xdg-utils Requires: xdg-utils
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
@ -232,7 +230,7 @@ format for easy browsing.
%patch24 -p1 -b .drkonq %patch24 -p1 -b .drkonq
%endif %endif
%patch27 -p1 -b .no_rpath %patch27 -p1 -b .no_rpath
%patch28 -p1 -b .icon-name-qt47 #patch28 -p1 -b .icon-name-qt47
# upstreamable patches # upstreamable patches
@ -451,8 +449,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Wed Jul 21 2010 Than Ngo <than@redhat.com> - 4.4.92-4 * Wed Jul 21 2010 Than Ngo <than@redhat.com> - 6:4.4.92-4
- requires: qt >= 4.7.0 - (Build)Requires: qt4(-devel) >= 4.7.0
- drop icon-name-qt47 patch
* Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.92-3 * Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.92-3
- Requires: oxygen-icon-theme (ensures default fallback is present) - Requires: oxygen-icon-theme (ensures default fallback is present)