rpms/arora/F-10 arora-0.8.0-fedorahome.patch, NONE, 1.1 arora-0.8.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 arora.spec, 1.11, 1.12 sources, 1.7, 1.8 arora-0.6-fedorahome.patch, 1.1, NONE arora-0.7.0-gitversion.patch, 1.1, NONE

Wed Jul 22 07:35:53 UTC 2009

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10379

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.8.0-fedorahome.patch arora-0.8.0-gitversion.patch 
Removed Files:
	arora-0.6-fedorahome.patch arora-0.7.0-gitversion.patch 
Log Message:
* Tue Jul 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.0-1
- Update to 0.8.0
- Removed custom arora.xml

* Thu Jul 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-3
- Arora-gnome subpackage now requires Arora package

* Tue Jun 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-2
- Adds arora-gnome subpackage to support preferred app selection
  in Gnome

Synced with devel


arora-0.8.0-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.8.0-fedorahome.patch ---
diff -up arora-0.8.0/src/browsermainwindow.cpp.fedorahome arora-0.8.0/src/browsermainwindow.cpp
--- arora-0.8.0/src/browsermainwindow.cpp.fedorahome	2009-07-20 00:47:14.000000000 +0200
+++ arora-0.8.0/src/browsermainwindow.cpp	2009-07-21 18:03:47.990573142 +0200
@@ -1328,7 +1328,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.8.0/src/settings.cpp.fedorahome arora-0.8.0/src/settings.cpp
--- arora-0.8.0/src/settings.cpp.fedorahome	2009-07-20 00:47:14.000000000 +0200
+++ arora-0.8.0/src/settings.cpp	2009-07-21 18:04:14.597573494 +0200
@@ -135,7 +135,7 @@ void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
     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.8.0-gitversion.patch:
 src.pri |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

--- NEW FILE arora-0.8.0-gitversion.patch ---
diff -up arora-0.7.1/src/src.pri.gitversion arora-0.7.1/src/src.pri
--- arora-0.7.1/src/src.pri.gitversion	2009-05-29 22:45:15.000000000 +0200
+++ arora-0.7.1/src/src.pri	2009-06-01 11:03:26.000000000 +0200
@@ -9,27 +9,8 @@ DEPENDPATH += $$PWD
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    exists($$PWD/../.git/HEAD) {
-        # Share object files for faster compiling
-        RCC_DIR     = $$PWD/.rcc
-        UI_DIR      = $$PWD/.ui
-        MOC_DIR     = $$PWD/.moc
-        OBJECTS_DIR = $$PWD/.obj
-
-        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=\"\\\"b158ec3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1059\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 May 2009 15:31:54 -0000	1.7
+++ .cvsignore	22 Jul 2009 07:35:52 -0000	1.8
@@ -1 +1 @@
-arora-0.7.0.tar.gz
+arora-0.8.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/arora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- arora.spec	25 May 2009 15:31:54 -0000	1.11
+++ arora.spec	22 Jul 2009 07:35:53 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           arora
-Version:        0.7.0
+Version:        0.8.0
 Release:        1%{?dist}
 Summary:        A cross platform web browser
 
@@ -7,13 +7,15 @@ 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.7.0-gitversion.patch
+Patch0:         arora-0.8.0-gitversion.patch
 Patch1:         arora-0.6-fedorabookmarks.patch
-Patch2:         arora-0.6-fedorahome.patch
+Patch2:         arora-0.8.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt-devel >= 4.4.0
+# for gnome default app path
+BuildRequires:  control-center-devel
 
 
 %description
@@ -22,6 +24,16 @@ Currently, Arora is still under developm
 browsing and other common features such as web history and bookmarks.
 
 
+%package gnome
+Summary:        Better Gnome support for Arora
+Group:          Applications/Internet
+Requires:       control-center
+Requires:       arora
+
+%description gnome
+Adds Arora to Preferred Applications list in Gnome Control Center.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .gitversion
@@ -30,8 +42,7 @@ browsing and other common features such 
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
-# does not build with %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,9 +72,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/scalable/apps/arora.svg
 %{_datadir}/arora
 %{_datadir}/pixmaps/arora.xpm
-%{_datadir}/man/man1/arora.1.gz
+%{_datadir}/man/man1
+
+%files gnome
+%defattr(-,root,root,-)
+%{_datadir}/gnome-control-center/default-apps
+
 
 %changelog
+* Tue Jul 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.0-1
+- Update to 0.8.0
+- Removed custom arora.xml
+
+* Thu Jul 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-3
+- Arora-gnome subpackage now requires Arora package
+
+* Tue Jun 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-2
+- Adds arora-gnome subpackage to support preferred app selection
+  in Gnome
+
 * Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
 - Update to 0.7.0
 - Googlesuggest removed
@@ -74,16 +101,19 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Apr 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.1-1
 - Update to 0.6.1
 
+* Mon Mar 30 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6-2
+- Add arora-cacheinfo to package
+
 * Mon Mar 30 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6-1
 - Update to 0.6
 
-* Mon Mar 30 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.5-2
-- Qt 4.5 rebuild
-
 * Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.5-1
 - Update to 0.5
 - SPEC file cleanup
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.4-3
 - owns arora and locale directories (bz#473621)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 May 2009 15:31:54 -0000	1.7
+++ sources	22 Jul 2009 07:35:53 -0000	1.8
@@ -1 +1 @@
-3318b0ad5d150dc245b6a036d28402be  arora-0.7.0.tar.gz
+f8c9a12cadbed8c85e8396db2ee62b8c  arora-0.8.0.tar.gz


--- arora-0.6-fedorahome.patch DELETED ---


--- arora-0.7.0-gitversion.patch DELETED ---


