rpms/arora/devel arora-0.4-fedorabookmarks.patch, NONE, 1.1 arora-0.4-fedorahome.patch, NONE, 1.1 arora-0.4-gitversion.patch, NONE, 1.1 arora.spec, 1.3, 1.4

Jaroslav Reznik jreznik at fedoraproject.org
Mon Oct 6 12:53:06 UTC 2008


Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8715

Modified Files:
	arora.spec 
Added Files:
	arora-0.4-fedorabookmarks.patch arora-0.4-fedorahome.patch 
	arora-0.4-gitversion.patch 
Log Message:
* Mon Oct 06 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.4-2
- Fedora Project & Red Hat bookmarks
- Fedora Project homepage
- GIT version patch



arora-0.4-fedorabookmarks.patch:

--- NEW FILE arora-0.4-fedorabookmarks.patch ---
diff -up arora-0.4/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.4/src/data/defaultbookmarks.xbel
--- arora-0.4/src/data/defaultbookmarks.xbel.fedorabookmarks	2008-10-01 03:17:22.000000000 +0200
+++ arora-0.4/src/data/defaultbookmarks.xbel	2008-10-06 13:32:04.000000000 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel version="1.0">
-    <folder folded="yes">
+    <folder folded="no">
         <title>Bookmarks Bar</title>
         <bookmark href="http://arora-browser.org/">
             <title>Arora</title>
@@ -9,26 +9,68 @@
         <bookmark href="http://webkit.org/">
             <title>WebKit.org</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/">
-            <title>Qt Documentation</title>
-        </bookmark>
-        <bookmark href="http://doc.trolltech.com/qq/">
-            <title>Qt Quarterly</title>
-        </bookmark>
-        <bookmark href="http://labs.trolltech.com/">
-            <title>Trolltech Labs</title>
-        </bookmark>
-        <bookmark href="http://www.qtcentre.org/">
-            <title>Qt Centre</title>
-        </bookmark>
-        <bookmark href="http://qt-apps.org/">
-            <title>Qt-Apps.org</title>
-        </bookmark>
+        <folder folded="no">
+            <title>Qt Labs</title>
+            <bookmark href="http://doc.trolltech.com/">
+                <title>Qt Documentation</title>
+            </bookmark>
+            <bookmark href="http://doc.trolltech.com/qq/">
+                <title>Qt Quarterly</title>
+            </bookmark>
+            <bookmark href="http://labs.trolltech.com/">
+                <title>Trolltech Labs</title>
+            </bookmark>
+            <bookmark href="http://www.qtcentre.org/">
+                <title>Qt Centre</title>
+            </bookmark>
+            <bookmark href="http://qt-apps.org/">
+                <title>Qt-Apps.org</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="yes">
+            <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>
         <bookmark href="http://xkcd.com/">
             <title>xkcd</title>
         </bookmark>
     </folder>
-    <folder folded="yes">
+    <folder folded="no">
         <title>Bookmarks Menu</title>
         <bookmark href="http://reddit.com/">
             <title>reddit.com: what's new online!</title>

arora-0.4-fedorahome.patch:

--- NEW FILE arora-0.4-fedorahome.patch ---
diff -up arora-0.4/src/browsermainwindow.cpp.fedorahome arora-0.4/src/browsermainwindow.cpp
--- arora-0.4/src/browsermainwindow.cpp.fedorahome	2008-10-01 03:17:22.000000000 +0200
+++ arora-0.4/src/browsermainwindow.cpp	2008-10-06 14:14:46.000000000 +0200
@@ -966,7 +966,7 @@ void BrowserMainWindow::slotHome()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("http://www.arora-browser.org")).toString();
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://fedoraproject.org")).toString();
     loadPage(home);
 }
 
diff -up arora-0.4/src/settings.cpp.fedorahome arora-0.4/src/settings.cpp
--- arora-0.4/src/settings.cpp.fedorahome	2008-10-06 14:15:30.000000000 +0200
+++ arora-0.4/src/settings.cpp	2008-10-06 14:13:10.000000000 +0200
@@ -113,7 +113,7 @@ void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("http://www.arora-browser.org");
+    QString defaultHome = QLatin1String("http://fedoraproject.org");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
     settings.endGroup();

arora-0.4-gitversion.patch:

--- NEW FILE arora-0.4-gitversion.patch ---
diff -up arora-0.4/src/src.pri.gitversion arora-0.4/src/src.pri
--- arora-0.4/src/src.pri.gitversion	2008-10-01 03:17:22.000000000 +0200
+++ arora-0.4/src/src.pri	2008-10-06 10:58:29.000000000 +0200
@@ -14,16 +14,8 @@ OBJECTS_DIR = .obj
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    GITVERSION=$$system(git log -n1 --pretty=format:%h)
-    DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
-    GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
-    DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
-}
+DEFINES += GITVERSION=\"\\\"835b3b6\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"388\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- arora.spec	1 Oct 2008 15:36:08 -0000	1.3
+++ arora.spec	6 Oct 2008 12:52:36 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           arora
 Version:        0.4
-Release:        1%{?dist}
+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.4-gitversion.patch
+Patch1:         arora-0.4-fedorabookmarks.patch
+Patch2:         arora-0.4-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,6 +28,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gitversion
+%patch1 -p1 -b .fedorabookmarks
+%patch2 -p1 -b .fedorahome
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -58,6 +64,10 @@
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Mon Oct 06 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.4-2
+- Fedora Project & Red Hat bookmarks
+- Fedora Project homepage
+- GIT version patch
 * Wed Oct 01 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.4-1
 - Updated to version 0.4
 * Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2




More information about the fedora-extras-commits mailing list