rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- -x11: Requires: %{name}-sqlite%{?_isa}

Browse Source
This commit is contained in:
Rex Dieter 2009-11-08 17:08:58 +00:00
parent 390b42cf03
commit 0f1c55d979
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kde-qt-patches.sh
View File

@ -2,4 +2,6 @@
# unfortunately, requires an already checked-out copy of the git repo # unfortunately, requires an already checked-out copy of the git repo
# when switching branches, use something like: git checkout --track -b remotes/origin/4.6.0-beta1-patched # when switching branches, use something like: git checkout --track -b remotes/origin/4.6.0-beta1-patched
git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6.0-beta1-patched #git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6.0-beta1-patched
git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6-stable-patched

7
qt.spec
View File

@ -14,7 +14,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.6.0 Version: 4.6.0
Release: 0.3.%{pre}%{?dist} Release: 0.4.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -354,7 +354,7 @@ Obsoletes: WebKit-qt < 1.0.0-1
Provides: WebKit-qt = 1.0.0-1 Provides: WebKit-qt = 1.0.0-1
%endif %endif
%if 0%{?sqlite:1} %if 0%{?sqlite:1}
Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-sqlite%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%endif %endif
Provides: qt4-assistant = %{version}-%{release} Provides: qt4-assistant = %{version}-%{release}
Provides: %{name}-assistant = %{version}-%{release} Provides: %{name}-assistant = %{version}-%{release}
@ -992,6 +992,9 @@ fi
%changelog %changelog
* Sun Nov 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.6.0-0.4.beta1
- -x11: Requires: %%{name}-sqlite%{?_isa}
* Mon Oct 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.6.0-0.3.beta1 * Mon Oct 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.6.0-0.3.beta1
- kde-qt patches (as of 20091026) - kde-qt patches (as of 20091026)