rpms/arora/F-12 arora-0.10.0-fedorabookmarks.patch, NONE, 1.1 arora-0.10.0-fedorahome.patch, NONE, 1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 arora.spec, 1.20, 1.21 sources, 1.10, 1.11 arora-0.8.0-fedorahome.patch, 1.1, NONE arora-0.9.0-fedorabookmarks.patch, 1.1, NONE arora-0.9.0-gitversion.patch, 1.1, NONE
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Oct 2 10:02:44 UTC 2009
- Previous message: rpms/python-tg-devtools/F-11 python-tg-devtools-sa05.patch, NONE, 1.1 python-tg-devtools-test_admin.patch, NONE, 1.1 python-tg-devtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/arora/F-11 arora-0.10.0-fedorabookmarks.patch, NONE, 1.1 arora-0.10.0-fedorahome.patch, NONE, 1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 arora.spec, 1.14, 1.15 sources, 1.9, 1.10 arora-0.8.0-fedorahome.patch, 1.1, NONE arora-0.9.0-fedorabookmarks.patch, 1.1, NONE arora-0.9.0-gitversion.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jreznik
Update of /cvs/pkgs/rpms/arora/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6524
Modified Files:
.cvsignore arora.spec sources
Added Files:
arora-0.10.0-fedorabookmarks.patch
arora-0.10.0-fedorahome.patch arora-0.10.0-gitversion.patch
Removed Files:
arora-0.8.0-fedorahome.patch arora-0.9.0-fedorabookmarks.patch
arora-0.9.0-gitversion.patch
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
- Fedorahome patch rebased
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
- Update to 0.10.0
arora-0.10.0-fedorabookmarks.patch:
defaultbookmarks.xbel | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
--- NEW FILE arora-0.10.0-fedorabookmarks.patch ---
diff -up arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.10.0/src/data/defaultbookmarks.xbel
--- arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks 2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/data/defaultbookmarks.xbel 2009-10-02 09:52:11.805729976 +0200
@@ -7,6 +7,45 @@
<title>Arora</title>
</bookmark>
</folder>
+ <folder folded="no">
+ <title>Fedora Project</title>
+ <bookmark href="http://fedoraproject.org/">
+ <title>Fedora Project</title>
+ </bookmark>
+ <bookmark href="http://docs.fedoraproject.org/release-notes/">
+ <title>Release Notes</title>
+ </bookmark>
+ <bookmark href="http://forums.fedoraforum.org/">
+ <title>Fedora Forum</title>
+ </bookmark>
+ <bookmark href="http://fedoraproject.org/wiki/FWN">
+ <title>Fedora Weekly News</title>
+ </bookmark>
+ <bookmark href="http://www.fedoraunity.org/">
+ <title>Fedora Unity Project</title>
+ </bookmark>
+ <bookmark href="http://planet.fedoraproject.org/">
+ <title>Planet Fedora</title>
+ </bookmark>
+ <bookmark href="http://fedoraproject.org/wiki/Communicate">
+ <title>Communicate</title>
+ </bookmark>
+ </folder>
+ <folder folded="no">
+ <title>Red Hat</title>
+ <bookmark href="http://www.redhatmagazine.com/">
+ <title>Red Hat Magazine</title>
+ </bookmark>
+ <bookmark href="http://mugshot.org/main">
+ <title>Mugshot</title>
+ </bookmark>
+ <bookmark href="http://www.redhat.com/">
+ <title>Red Hat</title>
+ </bookmark>
+ <bookmark href="http://www.jboss.com/">
+ <title>JBoss</title>
+ </bookmark>
+ </folder>
<folder folded="yes">
<title>Bookmarks Menu</title>
</folder>
arora-0.10.0-fedorahome.patch:
browsermainwindow.cpp | 2 +-
settings.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE arora-0.10.0-fedorahome.patch ---
diff -up arora-0.10.0/src/browsermainwindow.cpp.fedorahome arora-0.10.0/src/browsermainwindow.cpp
--- arora-0.10.0/src/browsermainwindow.cpp.fedorahome 2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/browsermainwindow.cpp 2009-10-02 09:52:59.515856829 +0200
@@ -1373,7 +1373,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.0/src/settings.cpp.fedorahome arora-0.10.0/src/settings.cpp
--- arora-0.10.0/src/settings.cpp.fedorahome 2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/settings.cpp 2009-10-02 09:52:59.518856379 +0200
@@ -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.0-gitversion.patch:
src.pri | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
--- NEW FILE arora-0.10.0-gitversion.patch ---
diff -up arora-0.10.0/src/src.pri.gitversion arora-0.10.0/src/src.pri
--- arora-0.10.0/src/src.pri.gitversion 2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/src.pri 2009-10-02 09:15:43.230739247 +0200
@@ -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=\"\\\"c65c20c\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1161\\\"\"
FORMS += \
aboutdialog.ui \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 31 Aug 2009 11:46:58 -0000 1.10
+++ .cvsignore 2 Oct 2009 10:02:44 -0000 1.11
@@ -1 +1 @@
-arora-0.9.0.tar.gz
+arora-0.10.0.tar.gz
Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/arora.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- arora.spec 20 Sep 2009 21:12:40 -0000 1.20
+++ arora.spec 2 Oct 2009 10:02:44 -0000 1.21
@@ -1,5 +1,5 @@
Name: arora
-Version: 0.9.0
+Version: 0.10.0
Release: 2%{?dist}
Summary: A cross platform web browser
@@ -7,9 +7,9 @@ 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.9.0-gitversion.patch
-Patch1: arora-0.9.0-fedorabookmarks.patch
-Patch2: arora-0.8.0-fedorahome.patch
+Patch0: arora-0.10.0-gitversion.patch
+Patch1: arora-0.10.0-fedorabookmarks.patch
+Patch2: arora-0.10.0-fedorahome.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -98,6 +98,12 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
+- Fedorahome patch rebased
+
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
- add icon/mime scriptlets
- don't own %%{_mandir}/man1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 31 Aug 2009 11:46:58 -0000 1.10
+++ sources 2 Oct 2009 10:02:44 -0000 1.11
@@ -1 +1 @@
-6473ddb24d65d468265c94710409937b arora-0.9.0.tar.gz
+664d48d4473f18f561583e453cd39e7d arora-0.10.0.tar.gz
--- arora-0.8.0-fedorahome.patch DELETED ---
--- arora-0.9.0-fedorabookmarks.patch DELETED ---
--- arora-0.9.0-gitversion.patch DELETED ---
- Previous message: rpms/python-tg-devtools/F-11 python-tg-devtools-sa05.patch, NONE, 1.1 python-tg-devtools-test_admin.patch, NONE, 1.1 python-tg-devtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/arora/F-11 arora-0.10.0-fedorabookmarks.patch, NONE, 1.1 arora-0.10.0-fedorahome.patch, NONE, 1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 arora.spec, 1.14, 1.15 sources, 1.9, 1.10 arora-0.8.0-fedorahome.patch, 1.1, NONE arora-0.9.0-fedorabookmarks.patch, 1.1, NONE arora-0.9.0-gitversion.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list