Merge branch 'master' into el6

Conflicts: .gitignore sources vidalia.desktop vidalia.spec
dist-git conversion
2012-11-23 07:40:51 +00:00 · 2010-07-29 14:58:18 +00:00 · 2010-05-08 02:27:27 +00:00 · 2010-04-21 03:45:57 +00:00 · 2010-04-21 03:11:39 +00:00 · 2010-02-02 12:00:17 +00:00
2 changed files with 35 additions and 4 deletions
--- a/vidalia.desktop
+++ b/vidalia.desktop
@ -1,9 +1,10 @@
 [Desktop Entry]
+Version=1.0
 Type=Application
 Name=Vidalia
 GenericName=Tor GUI
 Comment=GUI controller for the Tor Onion Routing Network 
 Exec=vidalia
 Terminal=false
-Categories=Network;Qt;
+Categories=Network;KDE;Qt;Security;
 Icon=vidalia
--- a/vidalia.spec
+++ b/vidalia.spec
@ -4,9 +4,10 @@ Release:	1%{?dist}
 Summary:	GUI controller for the Tor Onion Routing Network
 Group:		Applications/Internet
 License:	GPLv2+
-URL:		http://www.torproject.org/vidalia/
-Source0:	http://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
+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:	openssl-devel
 BuildRequires:	qt4-devel
 BuildRequires:	cmake
@ -41,7 +42,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 install -Dpm0644 doc/%{name}.1 \
 	%{buildroot}%{_mandir}/man1/%{name}.1

-desktop-file-install \
+desktop-file-install --vendor="" \
 	--dir %{buildroot}%{_datadir}/applications \
 	%{SOURCE1}

@ -65,6 +66,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %clean
 rm -rf %{buildroot}

+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG CREDITS LICENSE* README
@ -119,3 +121,31 @@ rm -rf %{buildroot}

 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.14-1
+- New upstream release
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-2
+- Merge builds for fedora and epel
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-1
+- Update to 0.1.13
+- Adjust to fedora and epel
+
+* Sun Apr 06 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.12-1
+- New upstream release
+- Correct typo in URL
+- Add R: hicolor for new handling of icons
+- Add update-icon-cache sniplet
+- Use summary of upstream for Desktopfile and in spec file
+- Create doxygen-documentations
+
+* Sun Feb 15 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.10-2
+- Correct Qt in Summary
+- Correct Qt in desktop-file-source
+- Add a german Translation in the desktop-file-source
+- Using CMAKE-macro instead of cmake
+- Add more files to more documentation
+
+* Tue Feb 10 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.10-1
+- Initial Package build
Author	SHA1	Message	Date
Jamie Nguyen	26c7aefb1e	Merge branch 'master' into el6 Conflicts: .gitignore sources vidalia.desktop vidalia.spec	2012-11-23 07:40:51 +00:00
Fedora Release Engineering	f31b50d4cd	dist-git conversion	2010-07-29 14:58:18 +00:00
Dennis Gilmore	d1ebc21a88	Initialize branch EL-6 for vidalia	2010-05-08 02:27:27 +00:00
supercyper	f8305f8cd9	fix DSOLinking	2010-04-21 03:45:57 +00:00
supercyper	61e05bb6f6	update to 0.2.8	2010-04-21 03:11:39 +00:00
supercyper	2fd3b5c314	sync with devel	2010-02-02 12:00:17 +00:00
supercyper	061146eb49	* empty log message *	2010-02-02 11:05:56 +00:00
supercyper	84c03b7227	* empty log message *	2010-02-01 16:33:38 +00:00
Bill Nottingham	9dfeb51a04	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:13:41 +00:00