Merge remote-tracking branch 'origin/f15' into f14
This commit is contained in:
commit
90065575e4
13
kdelibs.spec
13
kdelibs.spec
@ -1,6 +1,8 @@
|
|||||||
|
|
||||||
%define attica_ver 0.2.0
|
%define attica_ver 0.2.0
|
||||||
%define dbusmenu_qt_ver 0.5.2
|
%define dbusmenu_qt_ver 0.5.2
|
||||||
|
# need either >= 1.76 or <= 1.75 , mixing means broken kdoctools
|
||||||
|
%define docbook_style_xsl_ver 1.76
|
||||||
%define phonon_ver 4.4.4
|
%define phonon_ver 4.4.4
|
||||||
%define qt4_ver 4.7.0
|
%define qt4_ver 4.7.0
|
||||||
%define soprano_ver 2.6.0
|
%define soprano_ver 2.6.0
|
||||||
@ -16,7 +18,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.4
|
Version: 4.6.4
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -33,11 +35,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||||||
|
|
||||||
BuildRequires: kde4-macros(api) >= 2
|
BuildRequires: kde4-macros(api) >= 2
|
||||||
BuildRequires: kde-filesystem >= 4-23
|
BuildRequires: kde-filesystem >= 4-23
|
||||||
BuildRequires: docbook-dtds docbook-style-xsl
|
BuildRequires: docbook-dtds
|
||||||
|
BuildRequires: docbook-style-xsl >= %{docbook_style_xsl_ver}
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||||
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
||||||
Requires: docbook-dtds docbook-style-xsl
|
Requires: docbook-dtds
|
||||||
|
Requires: docbook-style-xsl >= %{docbook_style_xsl_ver}
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: kde-filesystem >= 4-23
|
Requires: kde-filesystem >= 4-23
|
||||||
Requires: kde-settings
|
Requires: kde-settings
|
||||||
@ -548,6 +552,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-5
|
||||||
|
- (Build)Requires: docbook-style-xsl >= 1.76
|
||||||
|
|
||||||
* Mon Jun 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-4
|
* Mon Jun 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-4
|
||||||
- upstream kdoctools/docbook patch (#690124)
|
- upstream kdoctools/docbook patch (#690124)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user