rpms/arora/devel arora-0.8.0-fedorahome.patch, NONE, 1.1 arora-0.8.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 arora.spec, 1.15, 1.16 sources, 1.8, 1.9 arora-0.6-fedorahome.patch, 1.1, NONE arora-0.7.1-gitversion.patch, 1.1, NONE
Jaroslav Reznik
jreznik at fedoraproject.org
Tue Jul 21 16:12:29 UTC 2009
Author: jreznik
Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24225
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.1-gitversion.patch
Log Message:
* Tue Tue 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.0-1
- Update to 0.8.0
- Removed custom arora.xml
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/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 1 Jun 2009 09:11:15 -0000 1.8
+++ .cvsignore 21 Jul 2009 16:11:59 -0000 1.9
@@ -1 +1 @@
-arora-0.7.1.tar.gz
+arora-0.8.0.tar.gz
Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- arora.spec 16 Jul 2009 11:42:25 -0000 1.15
+++ arora.spec 21 Jul 2009 16:11:59 -0000 1.16
@@ -1,20 +1,21 @@
Name: arora
-Version: 0.7.1
-Release: 3%{?dist}
+Version: 0.8.0
+Release: 1%{?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
-Source1: arora.xml
-Patch0: arora-0.7.1-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
@@ -52,8 +53,6 @@ desktop-file-install --vendor fedora \
--delete-original\
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-install -p -m 0644 -D %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/default-apps/arora.xml
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,7 +72,7 @@ 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,-)
@@ -81,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Tue 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 1 Jun 2009 09:11:15 -0000 1.8
+++ sources 21 Jul 2009 16:11:59 -0000 1.9
@@ -1 +1 @@
-3ae2cc30424a91b7e7bb2ccdee404911 arora-0.7.1.tar.gz
+f8c9a12cadbed8c85e8396db2ee62b8c arora-0.8.0.tar.gz
--- arora-0.6-fedorahome.patch DELETED ---
--- arora-0.7.1-gitversion.patch DELETED ---
More information about the fedora-extras-commits
mailing list