rpms/arora/devel arora-0.7.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 arora.spec, 1.11, 1.12 sources, 1.6, 1.7 arora-0.6.1-gitversion.patch, 1.1, NONE

[Jaroslav Reznik]

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.7.0-gitversion.patch 
Removed Files:
	arora-0.6.1-gitversion.patch 
Log Message:
* Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
- Update to 0.7.0
- Googlesuggest removed


arora-0.7.0-gitversion.patch:

--- NEW FILE arora-0.7.0-gitversion.patch ---
diff -up arora-0.7.0/src/src.pri.gitversion arora-0.7.0/src/src.pri
--- arora-0.7.0/src/src.pri.gitversion	2009-05-24 23:48:52.000000000 +0200
+++ arora-0.7.0/src/src.pri	2009-05-25 16:05:24.000000000 +0200
@@ -14,21 +14,8 @@ OBJECTS_DIR = $$PWD/.obj
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    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=\"\\\"dfd51d1\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"918"\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 May 2009 07:15:21 -0000	1.6
+++ .cvsignore	25 May 2009 15:12:54 -0000	1.7
@@ -1 +1 @@
-arora-0.6.1.tar.gz
+arora-0.7.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- arora.spec	9 May 2009 07:51:23 -0000	1.11
+++ arora.spec	25 May 2009 15:12:55 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           arora
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.7.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
-Patch0:         arora-0.6.1-gitversion.patch
+Patch0:         arora-0.7.0-gitversion.patch
 Patch1:         arora-0.6-fedorabookmarks.patch
 Patch2:         arora-0.6-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +30,8 @@ browsing and other common features such 
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
-make %{?_smp_mflags}
+# does not build with %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,7 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.GPL2 LICENSE.GPL3
 %{_bindir}/arora
 %{_bindir}/arora-placesimport
-%{_bindir}/googlesuggest
 %{_bindir}/htmlToXBel
 %{_bindir}/arora-cacheinfo
 %{_datadir}/applications/fedora-%{name}.desktop    
@@ -64,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
+- Update to 0.7.0
+- Googlesuggest removed
+
 * Sat May 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.1-2
 - Correct Changelog date
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 May 2009 07:15:21 -0000	1.6
+++ sources	25 May 2009 15:12:55 -0000	1.7
@@ -1 +1 @@
-7ef2c6914f4c02148ba4cbb3cc2276e3  arora-0.6.1.tar.gz
+3318b0ad5d150dc245b6a036d28402be  arora-0.7.0.tar.gz


--- arora-0.6.1-gitversion.patch DELETED ---