rpms/arora/F-11 arora-0.10.2-fedorahome.patch, NONE, 1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 arora.spec, 1.16, 1.17 sources, 1.11, 1.12 arora-0.10.0-fedorahome.patch, 1.1, NONE arora-0.10.1-gitversion.patch, 1.1, NONE
Jaroslav Reznik
jreznik at fedoraproject.org
Thu Dec 10 16:05:48 UTC 2009
Author: jreznik
Update of /cvs/pkgs/rpms/arora/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15093
Modified Files:
.cvsignore arora.spec sources
Added Files:
arora-0.10.2-fedorahome.patch arora-0.10.2-gitversion.patch
Removed Files:
arora-0.10.0-fedorahome.patch arora-0.10.1-gitversion.patch
Log Message:
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
- Conditionaly check for qt4 version
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
- Update to 0.10.2
- QtWebKit patch removed
* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
- Build over latest qtwebkit trunk from qt 4.6-rc1
* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
- respin against newer qt
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
- add dep on qt4 version built against
arora-0.10.2-fedorahome.patch:
browsermainwindow.cpp | 2 +-
settings.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE arora-0.10.2-fedorahome.patch ---
diff -up arora-0.10.2/src/browsermainwindow.cpp.fedorahome arora-0.10.2/src/browsermainwindow.cpp
--- arora-0.10.2/src/browsermainwindow.cpp.fedorahome 2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/browsermainwindow.cpp 2009-12-10 12:52:34.359736509 +0100
@@ -1398,7 +1398,7 @@ void BrowserMainWindow::goHome()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString home = settings.value(QLatin1String("home"), QLatin1String("about:home")).toString();
+ QString home = settings.value(QLatin1String("home"), QLatin1String("http://start.fedoraproject.org/")).toString();
tabWidget()->loadString(home);
}
diff -up arora-0.10.2/src/settings.cpp.fedorahome arora-0.10.2/src/settings.cpp
--- arora-0.10.2/src/settings.cpp.fedorahome 2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/settings.cpp 2009-12-10 12:52:34.359736509 +0100
@@ -143,7 +143,7 @@ void SettingsDialog::loadFromSettings()
settings.endGroup();
settings.beginGroup(QLatin1String("MainWindow"));
- QString defaultHome = QLatin1String("about:home");
+ QString defaultHome = QLatin1String("http://start.fedoraproject.org/");
homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
settings.endGroup();
arora-0.10.2-gitversion.patch:
src.pri | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
--- NEW FILE arora-0.10.2-gitversion.patch ---
diff -up arora-0.10.2/src/src.pri.gitversion arora-0.10.2/src/src.pri
--- arora-0.10.2/src/src.pri.gitversion 2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/src.pri 2009-12-10 13:08:40.120548737 +0100
@@ -15,21 +15,8 @@ UI_DIR = $$PWD/.ui
MOC_DIR = $$PWD/.moc
OBJECTS_DIR = $$PWD/.obj
-
-win32 {
- DEFINES += GITVERSION=0
- DEFINES += GITCHANGENUMBER=0
-} else {
- exists($$PWD/../.git/HEAD) {
- GITVERSION=$$system(git log -n1 --pretty=format:%h)
- DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
- GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
- DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
- } else {
- DEFINES += GITVERSION=\"\\\"0\\\"\"
- DEFINES += GITCHANGENUMBER=\"\\\"0\\\"\"
- }
-}
+DEFINES += GITVERSION=\"\\\"0a6f1f4\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1333\\\"\"
FORMS += \
aboutdialog.ui \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 6 Oct 2009 10:51:46 -0000 1.10
+++ .cvsignore 10 Dec 2009 16:05:47 -0000 1.11
@@ -1 +1 @@
-arora-0.10.1.tar.gz
+arora-0.10.2.tar.gz
Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/arora.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- arora.spec 6 Oct 2009 10:51:46 -0000 1.16
+++ arora.spec 10 Dec 2009 16:05:47 -0000 1.17
@@ -1,22 +1,23 @@
Name: arora
-Version: 0.10.1
-Release: 1%{?dist}
+Version: 0.10.2
+Release: 2%{?dist}
Summary: A cross platform web browser
Group: Applications/Internet
License: GPLv2+
URL: http://code.google.com/p/arora/
Source0: http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: arora-0.10.1-gitversion.patch
+Patch0: arora-0.10.2-gitversion.patch
Patch1: arora-0.10.0-fedorabookmarks.patch
-Patch2: arora-0.10.0-fedorahome.patch
+Patch2: arora-0.10.2-fedorahome.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.5.0
# for gnome default app path
BuildRequires: control-center-devel
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
Arora is a simple, cross platform web browser based on the QtWebKit engine.
@@ -98,6 +99,22 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
+- Conditionaly check for qt4 version
+
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
+- Update to 0.10.2
+- QtWebKit patch removed
+
+* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
+- Build over latest qtwebkit trunk from qt 4.6-rc1
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
+- respin against newer qt
+
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
+- add dep on qt4 version built against
+
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
- Update to 0.10.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 6 Oct 2009 10:51:46 -0000 1.11
+++ sources 10 Dec 2009 16:05:48 -0000 1.12
@@ -1 +1 @@
-ac38282a2d9134687d9c30dbb73c0fbc arora-0.10.1.tar.gz
+ccef0f214e0f03828cde8c521f7a5225 arora-0.10.2.tar.gz
--- arora-0.10.0-fedorahome.patch DELETED ---
--- arora-0.10.1-gitversion.patch DELETED ---
More information about the fedora-extras-commits
mailing list