rpms/vidalia/F-12 sources, 1.6, 1.7 vidalia.desktop, 1.1, 1.2 vidalia.spec, 1.8, 1.9

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/vidalia/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18144

Modified Files:
	sources vidalia.desktop vidalia.spec 
Log Message:
update to 0.2.8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Feb 2010 11:05:56 -0000	1.6
+++ sources	21 Apr 2010 03:11:39 -0000	1.7
@@ -1 +1 @@
-71fd5c040d7b20536d5226915c49e89a  vidalia-0.2.7.tar.gz
+027a8514efcdc957eb89630884db3f5e  vidalia-0.2.8.tar.gz


Index: vidalia.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-12/vidalia.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vidalia.desktop	29 Apr 2009 15:51:43 -0000	1.1
+++ vidalia.desktop	21 Apr 2010 03:11:39 -0000	1.2
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=Vidalia
 GenericName=GUI controller for the Tor Onion Routing Network 
 GenericName[de]=Kontrolloberfläche für das Tor Onion Routing Netzwerk
@@ -8,5 +7,4 @@ Exec=vidalia
 Terminal=false
 Type=Application
 Categories=Network;KDE;Qt;Security;
-StartupNotify=true
 Icon=vidalia


Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-12/vidalia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- vidalia.spec	2 Feb 2010 12:00:17 -0000	1.8
+++ vidalia.spec	21 Apr 2010 03:11:39 -0000	1.9
@@ -1,43 +1,27 @@
 Name:		vidalia
-Version:	0.2.7
-Release:	2%{?dist}
+Version:	0.2.8
+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
-#polipo can also work with vidalia
-#Requires:	privoxy
 Requires:	hicolor-icon-theme
-
+Obsoletes:	%{name}-doc < 0.2.8-1
 
 %description
 Vidalia is a cross-platform controller GUI for Tor, built using the Qt 
-framework. Vidalia allows you to start and stop Tor, view the status of Tor at 
-a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to 
-contribute to the Tor network by helping you setup a Tor server, if you wish.
-
-
-%package doc
-Summary:	Documentation for %{name}
-Group:		Documentation
-BuildRequires:	doxygen
-Requires:	%{name} = %{version}-%{release}
-BuildArch:	noarch
-
-%description doc
-Doxygen generated documentations for %{name}.
-
+framework. Vidalia allows you to start and stop Tor, view the status of 
+Tor at a glance, and monitor Tor's bandwidth usage. Vidalia also makes 
+it easy to contribute to the Tor network by helping you setup a Tor server,
+if you wish.
 
 %prep
 %setup -q
@@ -53,7 +37,6 @@ PATH=%{_libdir}/qt4/bin:$PATH; export PA
 %cmake .
 
 make %{?_smp_mflags}
-make doxygen
 
 
 %install
@@ -68,13 +51,11 @@ rm -rf %{buildroot}%{_datadir}/applicati
 install -Dpm0644 doc/%{name}.1 \
 	%{buildroot}%{_mandir}/man1/%{name}.1
 
-desktop-file-install \
-	%if 0%{?rhel}
-	--vendor="" \
-	%endif
+desktop-file-install --vendor="" \
 	--dir %{buildroot}%{_datadir}/applications \
 	%{SOURCE1}
 
+chmod -x contrib/*
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -97,18 +78,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
+%doc CHANGELOG CREDITS LICENSE* README
+%doc contrib
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
-
-%files doc
-%defattr(-,root,root,-)
-%doc doc/feature-* doc/status-* doc/geoip-* doc/version-spec.txt doc/html contrib
-
 %changelog
+* Wed Apr 21 2010 Chen Lei <supercyper at 163.com> - 0.2.8-1
+- New upstream release
+- Remove -doc subpackage
+
 * Sun Jan 31 2010 Chen Lei <supercyper at 163.com> - 0.2.7-2
 - Add contrib to -doc subpackage