rpms/arora/devel arora-0.7.1-gitversion.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 arora.spec, 1.12, 1.13 sources, 1.7, 1.8 arora-0.7.0-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-serv25055

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.7.1-gitversion.patch 
Removed Files:
	arora-0.7.0-gitversion.patch 
Log Message:
* Mon Jun 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-1
- Update to 0.7.1
- Parallel build reenabled, fixed in 0.7.1


arora-0.7.1-gitversion.patch:

--- NEW FILE arora-0.7.1-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=\"\\\"09ee9e3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"921\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 May 2009 15:12:54 -0000	1.7
+++ .cvsignore	1 Jun 2009 09:11:15 -0000	1.8
@@ -1 +1 @@
-arora-0.7.0.tar.gz
+arora-0.7.1.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- arora.spec	25 May 2009 15:12:55 -0000	1.12
+++ arora.spec	1 Jun 2009 09:11:15 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           arora
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        A cross platform web browser
 
@@ -7,7 +7,7 @@ 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.7.1-gitversion.patch
 Patch1:         arora-0.6-fedorabookmarks.patch
 Patch2:         arora-0.6-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,8 +30,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
@@ -64,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Mon Jun 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+- Parallel build reenabled, fixed in 0.7.1
+
 * Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
 - Update to 0.7.0
 - Googlesuggest removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 May 2009 15:12:55 -0000	1.7
+++ sources	1 Jun 2009 09:11:15 -0000	1.8
@@ -1 +1 @@
-3318b0ad5d150dc245b6a036d28402be  arora-0.7.0.tar.gz
+3ae2cc30424a91b7e7bb2ccdee404911  arora-0.7.1.tar.gz


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