[vidalia-svn] r3762: Try to reconcile oliver's changes in r3761 with phobos's cha (vidalia/trunk/pkg/rpm)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-05-06 21:41:05 -0400 (Wed, 06 May 2009)
New Revision: 3762

Modified:
   vidalia/trunk/pkg/rpm/vidalia.spec.in
Log:

Try to reconcile oliver's changes in r3761 with phobos's changes in r3712
and r3714.


Modified: vidalia/trunk/pkg/rpm/vidalia.spec.in
===================================================================
--- vidalia/trunk/pkg/rpm/vidalia.spec.in	2009-05-06 17:35:56 UTC (rev 3761)
+++ vidalia/trunk/pkg/rpm/vidalia.spec.in	2009-05-07 01:41:05 UTC (rev 3762)
@@ -1,34 +1,47 @@
+##
+##  $Id$
+## 
+##  This file is part of Vidalia, and is subject to the license terms in the
+##  LICENSE file, found in the top level directory of this distribution. If 
+##  you did not receive the LICENSE file with this file, you may obtain it
+##  from the Vidalia source package distributed by the Vidalia Project at
+##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
+##  may be copied, modified, propagated, or distributed except according to
+##  the terms described in the LICENSE file.
+##
+
 #%package vidalia
 
-%define _prefix         /usr/local
-%define _mandir         %{_prefix}/share/man
+%define _prefix   /usr/local
+%define _mandir   %{_prefix}/share/man
 
-
-Name		: vidalia
-Version		: 0.1.12
-Release		: RH5_3
+Name          : vidalia
+Version       : @VERSION@
+Release       : RH5_3
 #
-License		: GPL
-Summary		: The Tor-GUI for Linux
-Group		: Applications/Internet
+License       : GPL
+Summary       : A Tor GUI for Linux
+Group         : Applications/Internet
 
-URL		: http://www.vidalia-project.net
-Vendor		: Matt Edman, Justin Hipple
-Packager	: Oliver Niesner <digi_news@xxxxxx> 
+URL           : https://www.torproject.org/vidalia/
+Vendor        : Matt Edman, Justin Hipple
+Packager      : Oliver Niesner <digi_news@xxxxxx> 
 
-Source0		: %{name}-%{version}.tar.gz
+Source0       : %{name}-%{version}.tar.gz
 
-#AutoReq     	: No
-#AutoProv	: No
+#AutoReq      : No
+#AutoProv     : No
 
-Requires        : tor >= 0.1.2.18
-BuildRequires	: qt4 >= 4.2
-BuildRequires	: cmake >= 2.4
-BuildRoot	: /var/tmp/%{name}-buildroot
+Requires      : tor >= 0.2.0.34
+BuildRequires : qt4 >= 4.2
+# This fails on some systems because they lack a cmake rpm, such as
+# Redhat 5 and earlier
+BuildRequires : cmake >= 2.4
+BuildRoot     : /var/tmp/%{name}-buildroot
 
 %description
 
-Vidalia is an easy to use Tor-Controller GUI
+Vidalia is an easy-to-use Tor controller GUI
 
 %prep
 rm -rf %{buildroot}
@@ -43,16 +56,12 @@
 # -q      : Run quiety with minimum output
 # -T      : Disable the automatic unpacking of the archives.
 #######################################################################
-
-
-
 %setup
 %build  
 
 cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake . && make
 
 
-
 #########################################################
 # Common Red Hat RPM macros (rpm --showrc for more info)
 # {_sourcedir} : /usr/src/redhat/SOURCES
@@ -71,7 +80,6 @@
 
 %install
 
-
 make install DESTDIR=%{buildroot}
 #mkdir -p %{_prefix}/share/man/man1/
 #cp %{buildroot}/doc/vidalia.1 %{_prefix}/share/man/man1
@@ -93,9 +101,6 @@
 %{_prefix}/share/icons/hicolor/64x64/apps/vidalia.png
 
 
-
-
-
 #####################################################
 # defattr sets the default attributes for all files
 #####################################################
@@ -105,20 +110,21 @@
 * Wed May 06 2009 Oliver Niesner <digi_news@xxxxxx> 0.1.12
 - fix rebuild errors due wrong version usage of qmake
 - added additional icons
- 
+
+* Sat Apr 11 2009 Andrew Lewman <andrew@xxxxxxxxxxxxxx> 0.1.6-2
+- fix required Tor version
+- start integration into "package.sh"
+
 * Mon Mar 23 2009 Oliver Niesner <digi_news@xxxxxx> 0.1.12
 - bump to 0.1.12
 
 * Mon Nov 3 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.6-1
 - bump to 0.1.10
 
-* Tue Jul 30 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.6-1
-- bump to 0.1.6
-- fix man path
+* Wed Jul 30 2008  Oliver Niesner <digi_news@xxxxxx> 0.1.6-1
+- bump to 0.1.6 
+- fix man path 
 
-* Tue May 27 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.3-1
-- bump to 0.1.3
-
 * Mon Mar 31 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.2-1
 - bump to 0.1.2