diff --git a/.cvsignore b/.cvsignore index 9105739..a99f1be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -arora-0.10.0.tar.gz +arora-0.10.1.tar.gz diff --git a/arora-0.10.0-gitversion.patch b/arora-0.10.0-gitversion.patch deleted file mode 100644 index f268243..0000000 --- a/arora-0.10.0-gitversion.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 \ diff --git a/arora-0.10.1-gitversion.patch b/arora-0.10.1-gitversion.patch new file mode 100644 index 0000000..4431763 --- /dev/null +++ b/arora-0.10.1-gitversion.patch @@ -0,0 +1,27 @@ +diff -up arora-0.10.1/src/src.pri.gitversion arora-0.10.1/src/src.pri +--- arora-0.10.1/src/src.pri.gitversion 2009-10-05 05:31:48.000000000 +0200 ++++ arora-0.10.1/src/src.pri 2009-10-06 12:37:27.690582177 +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=\"\\\"e5385f3\\\"\" ++DEFINES += GITCHANGENUMBER=\"\\\"1329\\\"\" + + FORMS += \ + aboutdialog.ui \ diff --git a/arora.spec b/arora.spec index e5d9956..3583126 100644 --- a/arora.spec +++ b/arora.spec @@ -1,13 +1,13 @@ Name: arora -Version: 0.10.0 -Release: 2%{?dist} +Version: 0.10.1 +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 -Patch0: arora-0.10.0-gitversion.patch +Patch0: arora-0.10.1-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) @@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %changelog +* Tue Oct 06 2009 Jaroslav Reznik - 0.10.1-1 +- Update to 0.10.1 + * Fri Oct 02 2009 Jaroslav Reznik - 0.10.0-2 - Fedorahome patch rebased diff --git a/sources b/sources index e496a20..faa7ff2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -664d48d4473f18f561583e453cd39e7d arora-0.10.0.tar.gz +ac38282a2d9134687d9c30dbb73c0fbc arora-0.10.1.tar.gz