rpms/arora/F-10 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.13, 1.14 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
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Oct 2 10:31:14 UTC 2009
Author: jreznik
Update of /cvs/pkgs/rpms/arora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15230
Modified Files:
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
* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
- add icon/mime scriptlets
- don't own %%{_mandir}/man1
- BR: qt4-devel
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: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/arora.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- arora.spec 31 Aug 2009 11:58:32 -0000 1.13
+++ arora.spec 2 Oct 2009 10:31:14 -0000 1.14
@@ -1,19 +1,19 @@
Name: arora
-Version: 0.9.0
-Release: 1%{?dist}
+Version: 0.10.0
+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.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
-BuildRequires: qt-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.4.0
# for gnome default app path
BuildRequires: control-center-devel
@@ -28,7 +28,7 @@ browsing and other common features such
Summary: Better Gnome support for Arora
Group: Applications/Internet
Requires: control-center
-Requires: arora
+Requires: arora
%description gnome
Adds Arora to Preferred Applications list in Gnome Control Center.
@@ -48,6 +48,8 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install
+# imo, shouldn't add/change upstream vendor here, but changing
+# once released this way is bad too. :( -- Rex
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--delete-original\
@@ -57,6 +59,22 @@ desktop-file-install --vendor fedora \
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ update-desktop-database -q &> /dev/null
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog
@@ -70,16 +88,27 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/16x16/apps/arora.png
%{_datadir}/icons/hicolor/32x32/apps/arora.png
%{_datadir}/icons/hicolor/scalable/apps/arora.svg
-%{_datadir}/arora
+%{_datadir}/arora/
%{_datadir}/pixmaps/arora.xpm
-%{_datadir}/man/man1
+%{_mandir}/man1/*
%files gnome
%defattr(-,root,root,-)
-%{_datadir}/gnome-control-center/default-apps
+%{_datadir}/gnome-control-center/default-apps/
%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
+- BR: qt4-devel
+
* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
- Update to 0.9.0
@@ -139,4 +168,4 @@ rm -rf $RPM_BUILD_ROOT
- Location bar's double click selects all
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1
-- Initial spec file
\ No newline at end of file
+- Initial spec file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 31 Aug 2009 11:58:32 -0000 1.9
+++ sources 2 Oct 2009 10:31:14 -0000 1.10
@@ -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 ---
More information about the scm-commits
mailing list