[vidalia-svn] r3761: fixed rebuild error on redhat systems, thanks Matt, Simon fo (vidalia/trunk/pkg/rpm)

[oliver@xxxxxxxxxxxxxxxxxxx]

Author: oliver
Date: 2009-05-06 13:35:56 -0400 (Wed, 06 May 2009)
New Revision: 3761

Modified:
   vidalia/trunk/pkg/rpm/vidalia.spec.in
Log:
fixed rebuild error on redhat systems, thanks Matt, Simon for the hint

Modified: vidalia/trunk/pkg/rpm/vidalia.spec.in
===================================================================
--- vidalia/trunk/pkg/rpm/vidalia.spec.in	2009-05-06 04:16:24 UTC (rev 3760)
+++ vidalia/trunk/pkg/rpm/vidalia.spec.in	2009-05-06 17:35:56 UTC (rev 3761)
@@ -1,43 +1,34 @@
-##
-##  $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
 
-#%package vidalia
-Name      : vidalia
-Version   : @VERSION@
-Release   : 1
+%define _prefix         /usr/local
+%define _mandir         %{_prefix}/share/man
+
+
+Name		: vidalia
+Version		: 0.1.12
+Release		: RH5_3
 #
-License   : GPL
-Summary   : A Tor GUI for Linux
-Group     : Applications/Internet
+License		: GPL
+Summary		: The Tor-GUI for Linux
+Group		: Applications/Internet
 
-URL       : https://www.torproject.org/vidalia/
-Vendor    : Matt Edman, Justin Hipple
-Packager  : Oliver Niesner <digi_news@xxxxxx> 
+URL		: http://www.vidalia-project.net
+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.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
+Requires        : tor >= 0.1.2.18
+BuildRequires	: qt4 >= 4.2
+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}
@@ -52,12 +43,13 @@
 # -q      : Run quiety with minimum output
 # -T      : Disable the automatic unpacking of the archives.
 #######################################################################
+
+
+
 %setup
 %build  
-#./configure 
-#make
 
-cmake . && make
+cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake . && make
 
 
 
@@ -78,36 +70,55 @@
 #########################################################
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/local/bin
-mkdir -p $RPM_BUILD_ROOT/usr/local/share/man/man1
-#install -s -m 755 eject $RPM_BUILD_ROOT/usr/bin/eject
-#install -m 644 eject.1 $RPM_BUILD_ROOT/usr/man/man1/eject.1
 
-%makeinstall
+
+make install DESTDIR=%{buildroot}
+#mkdir -p %{_prefix}/share/man/man1/
+#cp %{buildroot}/doc/vidalia.1 %{_prefix}/share/man/man1
 #%post
 
 %clean
 rm -rf %{buildroot}
 
 %files
-/usr/local/bin/vidalia 
-/usr/local/share/man/man1/vidalia.1
+%{_prefix}/bin/vidalia
+%{_prefix}/share/applications/vidalia.desktop
+#%{_prefix}/share/man/man1/vidalia.1
+#%{_builddir}/%{name}-%{version}/doc/vidalia.1
+%{_prefix}/share/icons/hicolor/128x128/apps/vidalia.png
+%{_prefix}/share/icons/hicolor/16x16/apps/vidalia.png
+%{_prefix}/share/icons/hicolor/22x22/apps/vidalia.png
+%{_prefix}/share/icons/hicolor/32x32/apps/vidalia.png
+%{_prefix}/share/icons/hicolor/48x48/apps/vidalia.png
+%{_prefix}/share/icons/hicolor/64x64/apps/vidalia.png
 
+
+
+
+
 #####################################################
 # defattr sets the default attributes for all files
 #####################################################
 %defattr(-, root, root)
 
 %changelog
-* Sat Apr 11 2009 Andrew Lewman <andrew@xxxxxxxxxxxxxx> 0.1.6-2
-- fix required Tor version
-- start integration into "package.sh"
+* Wed May 06 2009 Oliver Niesner <digi_news@xxxxxx> 0.1.12
+- fix rebuild errors due wrong version usage of qmake
+- added additional icons
  
-* Wed Jul 30 2008  Oliver Niesner <digi_news@xxxxxx> 0.1.6-1
-- bump to 0.1.6 
-- fix man path 
+* 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
+
+* 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