rpms/vidalia/devel vidalia.spec,1.7,1.8

[supercyper]

Author: supercyper

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

Modified Files:
	vidalia.spec 
Log Message:
sync with  upstream



Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/devel/vidalia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- vidalia.spec	2 Sep 2009 19:30:39 -0000	1.7
+++ vidalia.spec	1 Feb 2010 07:45:08 -0000	1.8
@@ -1,23 +1,24 @@
-Name:             vidalia
-Version:          0.1.15
-Release:          1%{?dist}
-Summary:          GUI controller for the Tor Onion Routing Network
-
-Group:            Applications/Internet
-License:          GPLv2+
-URL:              https://www.torproject.org/vidalia/
-Source0:          https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
-Source1:          %{name}.desktop
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-BuildRequires:    desktop-file-utils
-BuildRequires:    openssl-devel
-BuildRequires:    qt4-devel
-BuildRequires:    cmake
-
-Requires:         tor
-Requires:         privoxy
-Requires:         hicolor-icon-theme
+Name:		vidalia
+Version:	0.2.7
+Release:	1%{?dist}
+Summary:	GUI controller for the Tor Onion Routing Network
+
+Group:		Applications/Internet
+License:	GPLv2+
+URL:		https://www.torproject.org/vidalia/
+Source0:	https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
+Source1:	%{name}.desktop
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	openssl-devel
+BuildRequires:	qt4-devel
+BuildRequires:	cmake
+
+Requires:	tor
+#any proxy caching server can work with vidalia
+#Requires:	privoxy
+Requires:	hicolor-icon-theme
 
 
 %description
@@ -28,11 +29,11 @@ contribute to the Tor network by helping
 
 
 %package doc
-Summary:        Documentation for %{name}
-Group:          Documentation
-BuildRequires:  doxygen
-Requires:       %{name} = %{version}-%{release}
-
+Summary:	Documentation for %{name}
+Group:		Documentation
+BuildRequires:	doxygen
+Requires:	%{name} = %{version}-%{release}
+BuildArch:	noarch
 
 %description doc
 Doxygen generated documentations for %{name}.
@@ -54,31 +55,31 @@ PATH=%{_libdir}/qt4/bin:$PATH; export PA
 make %{?_smp_mflags}
 
 cd doc
-doxygen Doxyfile.in
+doxygen Doxyfile
 
 
 %install
 rm -rf %{buildroot}
 
 make install \
-     INSTALL="install -p" \
-     DESTDIR=%{buildroot}
+	INSTALL="install -p" \
+	DESTDIR=%{buildroot}
 
-rm -rf  %{buildroot}%{_datadir}/applications/%{name}.desktop
+rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 install -Dpm0644 doc/%{name}.1 \
-        %{buildroot}%{_mandir}/man1/%{name}.1
+	%{buildroot}%{_mandir}/man1/%{name}.1
 
 desktop-file-install \
-        %if 0%{?rhel}
-        --vendor="" \
-        %endif
-        --dir %{buildroot}%{_datadir}/applications \
-        %{SOURCE1}
+	%if 0%{?rhel}
+	--vendor="" \
+	%endif
+	--dir %{buildroot}%{_datadir}/applications \
+	%{SOURCE1}
 
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
 install -Dpm0644 doc/html/* \
-        %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
+	%{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
 
 
 %post
@@ -87,8 +88,8 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
@@ -115,6 +116,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jan 31 2010 Chen Lei <supercyper at 163.com> - 0.2.7-1
+- New upstream release
+
 * Wed Sep 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.15-1
 - New upstream release