From f3de2c4c9f81d559c0aebd69900b5cc8c69e3b52 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 29 Apr 2009 15:51:43 +0000 Subject: [PATCH 01/31] *** empty log message *** --- .cvsignore | 1 + import.log | 1 + sources | 1 + vidalia.desktop | 12 +++++ vidalia.spec | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+) create mode 100644 import.log create mode 100644 vidalia.desktop create mode 100644 vidalia.spec diff --git a/.cvsignore b/.cvsignore index e69de29..1982f70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vidalia-0.1.12.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..96eb508 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 diff --git a/sources b/sources index e69de29..a6e153f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +5820043228e7303fa4bee714bd839804 vidalia-0.1.12.tar.gz diff --git a/vidalia.desktop b/vidalia.desktop new file mode 100644 index 0000000..6faff97 --- /dev/null +++ b/vidalia.desktop @@ -0,0 +1,12 @@ +[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 +Exec=vidalia +Terminal=false +Type=Application +Categories=Network;KDE;Qt;Security; +StartupNotify=true +Icon=vidalia diff --git a/vidalia.spec b/vidalia.spec new file mode 100644 index 0000000..b8be530 --- /dev/null +++ b/vidalia.spec @@ -0,0 +1,124 @@ +Name: vidalia +Version: 0.1.12 +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 + + +%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} + + +%description doc +Doxygen generated documentations for %{name}. + + +%prep +%setup -q + + +%build +%cmake . +make %{?_smp_mflags} + +cd doc +doxygen Doxyfile.in + + +%install +rm -rf %{buildroot} + +make install \ + INSTALL="install -p" \ + DESTDIR=%{buildroot} + +rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop + +install -Dpm0644 doc/%{name}.1 \ + %{buildroot}%{_mandir}/man1/%{name}.1 + +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + %{SOURCE1} + +mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ +install -Dpm0644 doc/html/* \ + %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ + + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README +%{_bindir}/%{name} +%{_mandir}/man1/%{name}* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png + + +%files doc +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}-doxygen/ + + +%changelog +* Sun Apr 06 2009 Simon Wesp - 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 - 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 - 0.1.10-1 +- Initial Package build From b0b37328869c9ea3a10b46f0a65cef8939804e45 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Mon, 1 Jun 2009 20:16:22 +0000 Subject: [PATCH 02/31] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 16 +++++++++++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1982f70..24a3d73 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.1.12.tar.gz +vidalia-0.1.13.tar.gz diff --git a/import.log b/import.log index 96eb508..b2d6c18 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 +vidalia-0_1_13-1_fc11:HEAD:vidalia-0.1.13-1.fc11.src.rpm:1243887330 diff --git a/sources b/sources index a6e153f..b55c8ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5820043228e7303fa4bee714bd839804 vidalia-0.1.12.tar.gz +b0fcd0a9c30b1ed545981fa7d8ac7d71 vidalia-0.1.13.tar.gz diff --git a/vidalia.spec b/vidalia.spec index b8be530..aac86f8 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,5 +1,5 @@ Name: vidalia -Version: 0.1.12 +Version: 0.1.13 Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network @@ -43,7 +43,14 @@ Doxygen generated documentations for %{name}. %build + %if 0%{?fedora} %cmake . + %endif + + %if 0%{?rhel} +%cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake . + %endif + make %{?_smp_mflags} cd doc @@ -63,6 +70,9 @@ install -Dpm0644 doc/%{name}.1 \ %{buildroot}%{_mandir}/man1/%{name}.1 desktop-file-install \ + %if 0%{?rhel} + --vendor="" \ + %endif --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -105,6 +115,10 @@ rm -rf %{buildroot} %changelog +* Mon Jun 01 2009 Simon Wesp - 0.1.13-1 +- Update to 0.1.13 +- Adjust to fedora and epel + * Sun Apr 06 2009 Simon Wesp - 0.1.12-1 - New upstream release - Correct typo in URL From 9cf80df1357bb2c9a33fb1bd00a2f335149a5e6f Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 2 Jun 2009 04:47:18 +0000 Subject: [PATCH 03/31] *** empty log message *** --- vidalia.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index aac86f8..76086f9 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -43,13 +43,13 @@ Doxygen generated documentations for %{name}. %build - %if 0%{?fedora} -%cmake . - %endif +%if 0%{?_qt4_bindir:1} +PATH=%{_qt4_bindir}:$PATH; export PATH +%else +PATH=%{_libdir}/qt4/bin:$PATH; export PATH +%endif - %if 0%{?rhel} -%cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake . - %endif +%cmake . make %{?_smp_mflags} @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Mon Jun 01 2009 Simon Wesp - 0.1.13-2 +- Merge builds for fedora and epel + * Mon Jun 01 2009 Simon Wesp - 0.1.13-1 - Update to 0.1.13 - Adjust to fedora and epel From aa25975f6ceb184e68d11e90ee91eb33238916e3 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 7 Jul 2009 20:40:15 +0000 Subject: [PATCH 04/31] *** empty log message *** --- import.log | 1 + 1 file changed, 1 insertion(+) diff --git a/import.log b/import.log index b2d6c18..47416c9 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 vidalia-0_1_13-1_fc11:HEAD:vidalia-0.1.13-1.fc11.src.rpm:1243887330 +vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246995303 From 5be610e6a86eb46bb30b751656061e0729fce088 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 7 Jul 2009 20:43:04 +0000 Subject: [PATCH 05/31] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 7 +++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 24a3d73..3afe7a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.1.13.tar.gz +vidalia-0.1.14.tar.gz diff --git a/import.log b/import.log index 47416c9..af4efe6 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 vidalia-0_1_13-1_fc11:HEAD:vidalia-0.1.13-1.fc11.src.rpm:1243887330 vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246995303 +vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246999255 diff --git a/sources b/sources index b55c8ec..d09a33b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0fcd0a9c30b1ed545981fa7d8ac7d71 vidalia-0.1.13.tar.gz +342990326e761c95b29d999dfb8ef02f vidalia-0.1.14.tar.gz diff --git a/vidalia.spec b/vidalia.spec index 76086f9..4d18f4b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia -Version: 0.1.13 -Release: 2%{?dist} +Version: 0.1.14 +Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 07 2009 Simon Wesp - 0.1.14-1 +- New upstream release + * Mon Jun 01 2009 Simon Wesp - 0.1.13-2 - Merge builds for fedora and epel From bce4bb41e4f947753db9f774a807d3fc81119ffa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:51:40 +0000 Subject: [PATCH 06/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 4d18f4b..6b47a0b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.1.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 0.1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 07 2009 Simon Wesp - 0.1.14-1 - New upstream release From 0cc5918550f0af67ad5916fbe3b6454f47333817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 16:21:20 +0000 Subject: [PATCH 07/31] - rebuilt with new openssl --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 6b47a0b..7d9e328 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 21 2009 Tomas Mraz - 0.1.14-3 +- rebuilt with new openssl + * Sun Jul 26 2009 Fedora Release Engineering - 0.1.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c9fa3f376b7f481b7b7080c9938a95927df7e0e3 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 2 Sep 2009 19:30:39 +0000 Subject: [PATCH 08/31] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 7 +++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3afe7a1..8cc6952 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.1.14.tar.gz +vidalia-0.1.15.tar.gz diff --git a/import.log b/import.log index af4efe6..0ebead7 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 vidalia-0_1_13-1_fc11:HEAD:vidalia-0.1.13-1.fc11.src.rpm:1243887330 vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246995303 vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246999255 +vidalia-0_1_15-1_fc11:HEAD:vidalia-0.1.15-1.fc11.src.rpm:1251919674 diff --git a/sources b/sources index d09a33b..5942a6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -342990326e761c95b29d999dfb8ef02f vidalia-0.1.14.tar.gz +005afad126dc6142d7748ec185d9fafe vidalia-0.1.15.tar.gz diff --git a/vidalia.spec b/vidalia.spec index 7d9e328..61248e7 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia -Version: 0.1.14 -Release: 3%{?dist} +Version: 0.1.15 +Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Wed Sep 02 2009 Simon Wesp - 0.15-1 +- New upstream release + * Fri Aug 21 2009 Tomas Mraz - 0.1.14-3 - rebuilt with new openssl From 3d61c7e8f8406d26b81cfd064e9be201b39e5880 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:21 +0000 Subject: [PATCH 09/31] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d97a3b..1cf6447 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vidalia -# $Id$ +# $Id: Makefile,v 1.1 2009/04/29 02:51:42 kevin Exp $ NAME := vidalia SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c67794868c97fd45727b248aa6e2e509faec7413 Mon Sep 17 00:00:00 2001 From: supercyper Date: Mon, 1 Feb 2010 07:43:44 +0000 Subject: [PATCH 10/31] *** empty log message *** --- .cvsignore | 2 +- import.log | 5 ----- sources | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 8cc6952..9915d41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.1.15.tar.gz +vidalia-0.2.7.tar.gz diff --git a/import.log b/import.log deleted file mode 100644 index 0ebead7..0000000 --- a/import.log +++ /dev/null @@ -1,5 +0,0 @@ -vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214 -vidalia-0_1_13-1_fc11:HEAD:vidalia-0.1.13-1.fc11.src.rpm:1243887330 -vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246995303 -vidalia-0_1_14-1_fc11:HEAD:vidalia-0.1.14-1.fc11.src.rpm:1246999255 -vidalia-0_1_15-1_fc11:HEAD:vidalia-0.1.15-1.fc11.src.rpm:1251919674 diff --git a/sources b/sources index 5942a6f..2b8b16e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -005afad126dc6142d7748ec185d9fafe vidalia-0.1.15.tar.gz +71fd5c040d7b20536d5226915c49e89a vidalia-0.2.7.tar.gz From 405d5463da0163966ddc2ceb9e27c66adda1e695 Mon Sep 17 00:00:00 2001 From: supercyper Date: Mon, 1 Feb 2010 07:45:08 +0000 Subject: [PATCH 11/31] sync with upstream --- vidalia.spec | 74 +++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index 61248e7..70d06f3 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,23 +1,24 @@ -Name: vidalia -Version: 0.1.15 -Release: 1%{?dist} -Summary: GUI controller for the Tor Onion Routing Network +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) +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 +BuildRequires: desktop-file-utils +BuildRequires: openssl-devel +BuildRequires: qt4-devel +BuildRequires: cmake -Requires: tor -Requires: privoxy -Requires: hicolor-icon-theme +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 you setup a Tor server, if you wish. %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 PATH 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/hicolor &>/dev/null || : %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 - 0.2.7-1 +- New upstream release + * Wed Sep 02 2009 Simon Wesp - 0.15-1 - New upstream release From 3a00ef018d8df1849e89811253afd7ec795072ec Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 2 Feb 2010 11:58:22 +0000 Subject: [PATCH 12/31] Add contrib to -doc subpackage --- vidalia.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index 70d06f3..3fae71e 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -16,7 +16,7 @@ BuildRequires: qt4-devel BuildRequires: cmake Requires: tor -#any proxy caching server can work with vidalia +#polipo can also work with vidalia #Requires: privoxy Requires: hicolor-icon-theme @@ -53,9 +53,7 @@ PATH=%{_libdir}/qt4/bin:$PATH; export PATH %cmake . make %{?_smp_mflags} - -cd doc -doxygen Doxyfile +make doxygen %install @@ -77,10 +75,6 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} -mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ -install -Dpm0644 doc/html/* \ - %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -112,10 +106,12 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%{_docdir}/%{name}-%{version}-doxygen/ - +%doc doc/feature-* doc/status-* doc/geoip-* doc/version-spec.txt doc/html contrib %changelog +* Sun Jan 31 2010 Chen Lei - 0.2.7-2 +- Add contrib to -doc subpackage + * Sun Jan 31 2010 Chen Lei - 0.2.7-1 - New upstream release From 759f4a582f8efe0a43d8d4c792de5c74c52f82ba Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:09:56 +0000 Subject: [PATCH 13/31] update to 0.2.8 --- .cvsignore | 1 + sources | 2 +- vidalia.desktop | 2 -- vidalia.spec | 49 +++++++++++++++---------------------------------- 4 files changed, 17 insertions(+), 37 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9915d41..2080ed1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ vidalia-0.2.7.tar.gz +vidalia-0.2.8.tar.gz diff --git a/sources b/sources index 2b8b16e..8f13fa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71fd5c040d7b20536d5226915c49e89a vidalia-0.2.7.tar.gz +027a8514efcdc957eb89630884db3f5e vidalia-0.2.8.tar.gz diff --git a/vidalia.desktop b/vidalia.desktop index 6faff97..9ea1afd 100644 --- a/vidalia.desktop +++ b/vidalia.desktop @@ -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 diff --git a/vidalia.spec b/vidalia.spec index 3fae71e..d4e8958 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -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 PATH %cmake . make %{?_smp_mflags} -make doxygen %install @@ -68,13 +51,11 @@ rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop 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 - 0.2.8-1 +- New upstream release +- Remove -doc subpackage + * Sun Jan 31 2010 Chen Lei - 0.2.7-2 - Add contrib to -doc subpackage From b47ac4aaf6c59686056cd03009804cbb000056dc Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:45:45 +0000 Subject: [PATCH 14/31] fix DSOLinking --- vidalia.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index d4e8958..7355141 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -33,7 +33,8 @@ PATH=%{_qt4_bindir}:$PATH; export PATH %else PATH=%{_libdir}/qt4/bin:$PATH; export PATH %endif - +# fix DSOLinking +sed -i '/torcontrol/a \ \ z' src/vidalia/CMakeLists.txt %cmake . make %{?_smp_mflags} From 78f7d594dee9a23f5fd4163c613c1bc58d2416c5 Mon Sep 17 00:00:00 2001 From: supercyper Date: Thu, 6 May 2010 03:23:48 +0000 Subject: [PATCH 15/31] *** empty log message *** --- vidalia.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vidalia.desktop b/vidalia.desktop index 9ea1afd..541add9 100644 --- a/vidalia.desktop +++ b/vidalia.desktop @@ -6,5 +6,5 @@ GenericName[de]=Kontrolloberfläche für das Tor Onion Routing Netzwerk Exec=vidalia Terminal=false Type=Application -Categories=Network;KDE;Qt;Security; +Categories=Network;Qt; Icon=vidalia From e5600e6699eaf8313d3f14407b3ce7da2be69951 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 26 May 2010 13:07:27 +0000 Subject: [PATCH 16/31] *** empty log message *** --- .cvsignore | 3 +-- sources | 2 +- vidalia.desktop | 7 +++---- vidalia.spec | 27 ++++++++++----------------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2080ed1..7a3a4f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -vidalia-0.2.7.tar.gz -vidalia-0.2.8.tar.gz +vidalia-0.2.9.tar.gz diff --git a/sources b/sources index 8f13fa7..510145d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -027a8514efcdc957eb89630884db3f5e vidalia-0.2.8.tar.gz +8ce038ba6c3b511a4788bc3926b3390e vidalia-0.2.9.tar.gz diff --git a/vidalia.desktop b/vidalia.desktop index 541add9..1b93654 100644 --- a/vidalia.desktop +++ b/vidalia.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Version=1.0 +Type=Application Name=Vidalia -GenericName=GUI controller for the Tor Onion Routing Network -GenericName[de]=Kontrolloberfläche für das Tor Onion Routing Netzwerk +GenericName=Tor GUI +Comment=GUI controller for the Tor Onion Routing Network Exec=vidalia Terminal=false -Type=Application Categories=Network;Qt; Icon=vidalia diff --git a/vidalia.spec b/vidalia.spec index 7355141..119e626 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,5 +1,5 @@ Name: vidalia -Version: 0.2.8 +Version: 0.2.9 Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -7,13 +7,13 @@ 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 +BuildRequires: desktop-file-utils +Requires: tor%{?_isa} Requires: hicolor-icon-theme +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Obsoletes: %{name}-doc < 0.2.8-1 %description @@ -28,11 +28,7 @@ if you wish. %build -%if 0%{?_qt4_bindir:1} -PATH=%{_qt4_bindir}:$PATH; export PATH -%else -PATH=%{_libdir}/qt4/bin:$PATH; export PATH -%endif +export PATH=%{_qt4_bindir}:$PATH # fix DSOLinking sed -i '/torcontrol/a \ \ z' src/vidalia/CMakeLists.txt %cmake . @@ -41,18 +37,12 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - -make install \ - INSTALL="install -p" \ - DESTDIR=%{buildroot} - -rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop +make install INSTALL="install -p" DESTDIR=%{buildroot} install -Dpm0644 doc/%{name}.1 \ %{buildroot}%{_mandir}/man1/%{name}.1 -desktop-file-install --vendor="" \ +desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -87,6 +77,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed May 26 2010 Chen Lei - 0.2.9-1 +- New upstream release + * Wed Apr 21 2010 Chen Lei - 0.2.8-1 - New upstream release - Remove -doc subpackage From 64072ffd7f886b2d29650fec1c630612a5e2c7ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:17 +0000 Subject: [PATCH 17/31] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 1cf6447..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vidalia -# $Id: Makefile,v 1.1 2009/04/29 02:51:42 kevin Exp $ -NAME := vidalia -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 3bd51960e2932e88e67c7da4ca5191216aaa74ce Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Sat, 18 Sep 2010 12:37:55 +0800 Subject: [PATCH 18/31] Update to 0.2.10 --- .gitignore | 2 +- sources | 2 +- vidalia.spec | 54 +++++++++++++--------------------------------------- 3 files changed, 15 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 7a3a4f0..73591bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -vidalia-0.2.9.tar.gz +/vidalia-0.2.10.tar.gz diff --git a/sources b/sources index 510145d..3acdef7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ce038ba6c3b511a4788bc3926b3390e vidalia-0.2.9.tar.gz +ae5a46cc362e2db54f8751ccc9becaba vidalia-0.2.10.tar.gz diff --git a/vidalia.spec b/vidalia.spec index 119e626..e7c8139 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,17 +1,17 @@ Name: vidalia -Version: 0.2.9 +Version: 0.2.10 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 +URL: http://www.torproject.org/vidalia/ +Source0: http://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRequires: openssl-devel BuildRequires: qt4-devel BuildRequires: cmake BuildRequires: desktop-file-utils -Requires: tor%{?_isa} +Requires: tor Requires: hicolor-icon-theme %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Obsoletes: %{name}-doc < 0.2.8-1 @@ -26,18 +26,16 @@ if you wish. %prep %setup -q - %build -export PATH=%{_qt4_bindir}:$PATH -# fix DSOLinking -sed -i '/torcontrol/a \ \ z' src/vidalia/CMakeLists.txt -%cmake . - -make %{?_smp_mflags} +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} .. +popd +make %{?_smp_mflags} -C %{_target_platform} %install -make install INSTALL="install -p" DESTDIR=%{buildroot} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} install -Dpm0644 doc/%{name}.1 \ %{buildroot}%{_mandir}/man1/%{name}.1 @@ -66,7 +64,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc CHANGELOG CREDITS LICENSE* README @@ -77,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Sep 17 2010 Chen Lei - 0.2.10-1 +- New upstream release + * Wed May 26 2010 Chen Lei - 0.2.9-1 - New upstream release @@ -98,31 +98,3 @@ rm -rf %{buildroot} * Sun Jul 26 2009 Fedora Release Engineering - 0.1.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 07 2009 Simon Wesp - 0.1.14-1 -- New upstream release - -* Mon Jun 01 2009 Simon Wesp - 0.1.13-2 -- Merge builds for fedora and epel - -* Mon Jun 01 2009 Simon Wesp - 0.1.13-1 -- Update to 0.1.13 -- Adjust to fedora and epel - -* Sun Apr 06 2009 Simon Wesp - 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 - 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 - 0.1.10-1 -- Initial Package build From fcd4e44ecae1b6cdad7f24c0a631233f6340c632 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 15:26:11 -0700 Subject: [PATCH 19/31] - Rebuilt for gcc bug 634757 --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index e7c8139..53ad40b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Sep 29 2010 jkeating - 0.2.10-2 +- Rebuilt for gcc bug 634757 + * Fri Sep 17 2010 Chen Lei - 0.2.10-1 - New upstream release From c56debaecf2b05d56e796eeb323ae5a8d0ba3b7f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:25:49 -0600 Subject: [PATCH 20/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 53ad40b..8c31467 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Sep 29 2010 jkeating - 0.2.10-2 - Rebuilt for gcc bug 634757 From 773185c4572ab7c03c18b91f5c4bee175acd576c Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Sun, 22 May 2011 06:25:37 -0600 Subject: [PATCH 21/31] Update to 0.2.12 --- .gitignore | 2 +- sources | 2 +- vidalia.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 73591bd..ea6fbe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/vidalia-0.2.10.tar.gz +/vidalia-0.2.12.tar.gz diff --git a/sources b/sources index 3acdef7..47d7107 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae5a46cc362e2db54f8751ccc9becaba vidalia-0.2.10.tar.gz +f1e108af87676980ff821c36ce8d87e2 vidalia-0.2.12.tar.gz diff --git a/vidalia.spec b/vidalia.spec index 8c31467..783b0d3 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia -Version: 0.2.10 -Release: 3%{?dist} +Version: 0.2.12 +Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun May 22 2011 Chen Lei - 0.2.12-1 +- New upstream release + * Mon Feb 07 2011 Fedora Release Engineering - 0.2.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From fded45a8f81a25fcd0fb3aed7e5b0a5abe64cda5 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sat, 7 Jan 2012 12:31:51 +0100 Subject: [PATCH 22/31] * Sat Jan 07 2012 Paul Wouters - 0.2.15-1 - Updated to 0.2.15 - Don't use --delete-original in desktop-file-install - Fix obsolete-not-provided vidalia-doc --- .gitignore | 1 + sources | 2 +- vidalia.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ea6fbe5..a1ec942 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vidalia-0.2.12.tar.gz +/vidalia-0.2.15.tar.gz diff --git a/sources b/sources index 47d7107..61f658c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1e108af87676980ff821c36ce8d87e2 vidalia-0.2.12.tar.gz +845b627eb2534aa5da29efd6c8d30978 vidalia-0.2.15.tar.gz diff --git a/vidalia.spec b/vidalia.spec index 783b0d3..9472ecb 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,5 +1,5 @@ Name: vidalia -Version: 0.2.12 +Version: 0.2.15 Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet @@ -15,6 +15,7 @@ Requires: tor Requires: hicolor-icon-theme %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Obsoletes: %{name}-doc < 0.2.8-1 +Provides: %{name}-doc = 0.2.8-1 %description Vidalia is a cross-platform controller GUI for Tor, built using the Qt @@ -40,7 +41,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} install -Dpm0644 doc/%{name}.1 \ %{buildroot}%{_mandir}/man1/%{name}.1 -desktop-file-install --delete-original \ +desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -74,6 +75,11 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sat Jan 07 2012 Paul Wouters - 0.2.15-1 +- Updated to 0.2.15 +- Don't use --delete-original in desktop-file-install +- Fix obsolete-not-provided vidalia-doc + * Sun May 22 2011 Chen Lei - 0.2.12-1 - New upstream release From e652d6c10d04ad9ca584d1919d4644c88892ee37 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:40:25 -0500 Subject: [PATCH 23/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 9472ecb..ca8c8de 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 07 2012 Paul Wouters - 0.2.15-1 - Updated to 0.2.15 - Don't use --delete-original in desktop-file-install From 589cb03a5b9c25c57e125458f0802f77e92aa550 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 15 Nov 2012 14:41:32 -0500 Subject: [PATCH 24/31] * Thu Nov 15 2012 Paul Wouters - 0.2.20-1 - Updated to 0.2.20 --- .gitignore | 1 + sources | 2 +- vidalia.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1ec942..7140846 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vidalia-0.2.12.tar.gz /vidalia-0.2.15.tar.gz +/vidalia-0.2.20.tar.gz diff --git a/sources b/sources index 61f658c..bd07bca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -845b627eb2534aa5da29efd6c8d30978 vidalia-0.2.15.tar.gz +f40a3a1c43f4a1f16322969c0cb6f5bf vidalia-0.2.20.tar.gz diff --git a/vidalia.spec b/vidalia.spec index ca8c8de..7905825 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia -Version: 0.2.15 -Release: 2%{?dist} +Version: 0.2.20 +Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Nov 15 2012 Paul Wouters - 0.2.20-1 +- Updated to 0.2.20 + * Sun Jul 22 2012 Fedora Release Engineering - 0.2.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 461d5529910d0aa9b0f72b420c6ce325500db279 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:46:07 -0600 Subject: [PATCH 25/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 7905825..7fa577b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Nov 15 2012 Paul Wouters - 0.2.20-1 - Updated to 0.2.20 From 961334c1498993224e08b64b7c0c987d8dd96856 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:09:52 -0500 Subject: [PATCH 26/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 7fa577b..83e1a79 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.2.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 80992f5ef4a0913f2842469aa32772c41d64a5c8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:37:42 -0500 Subject: [PATCH 27/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 83e1a79..41470d1 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.2.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.2.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 6b1a05f9cfb3ed04b5c47839ab6bf0c0b02213b2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:50:03 +0000 Subject: [PATCH 28/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 41470d1..91f7e6c 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.2.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0d5794f1e5089ce2906efaceddee5f5e55f4df8f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:30:54 +0200 Subject: [PATCH 29/31] Rebuilt for GCC 5 C++11 ABI change --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index 91f7e6c..bc47063 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sat May 02 2015 Kalev Lember - 0.2.20-6 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 0.2.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ebea7cb8c1c4855973ea7c9c3c6fa20e6abcfa48 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:58:59 +0000 Subject: [PATCH 30/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vidalia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vidalia.spec b/vidalia.spec index bc47063..a47721b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.2.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI controller for the Tor Onion Routing Network Group: Applications/Internet License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 0.2.20-6 - Rebuilt for GCC 5 C++11 ABI change From 99fb0e469f9f110e015dc32508693cd8d9c7c86f Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Fri, 11 Dec 2015 16:42:33 +0000 Subject: [PATCH 31/31] Upstream recommend against using this software anymore. --- .gitignore | 3 -- dead.package | 1 + sources | 1 - vidalia.desktop | 9 ---- vidalia.spec | 139 ------------------------------------------------ 5 files changed, 1 insertion(+), 152 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vidalia.desktop delete mode 100644 vidalia.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7140846..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/vidalia-0.2.12.tar.gz -/vidalia-0.2.15.tar.gz -/vidalia-0.2.20.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e607345 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Upstream recommend against using this software anymore. diff --git a/sources b/sources deleted file mode 100644 index bd07bca..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f40a3a1c43f4a1f16322969c0cb6f5bf vidalia-0.2.20.tar.gz diff --git a/vidalia.desktop b/vidalia.desktop deleted file mode 100644 index 1b93654..0000000 --- a/vidalia.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Vidalia -GenericName=Tor GUI -Comment=GUI controller for the Tor Onion Routing Network -Exec=vidalia -Terminal=false -Categories=Network;Qt; -Icon=vidalia diff --git a/vidalia.spec b/vidalia.spec deleted file mode 100644 index a47721b..0000000 --- a/vidalia.spec +++ /dev/null @@ -1,139 +0,0 @@ -Name: vidalia -Version: 0.2.20 -Release: 7%{?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 -Source1: %{name}.desktop -BuildRequires: openssl-devel -BuildRequires: qt4-devel -BuildRequires: cmake -BuildRequires: desktop-file-utils -Requires: tor -Requires: hicolor-icon-theme -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} -Obsoletes: %{name}-doc < 0.2.8-1 -Provides: %{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. - -%prep -%setup -q - -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - -%install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - -install -Dpm0644 doc/%{name}.1 \ - %{buildroot}%{_mandir}/man1/%{name}.1 - -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE1} - -chmod -x contrib/* - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%doc CHANGELOG CREDITS LICENSE* README -%doc contrib -%{_bindir}/%{name} -%{_mandir}/man1/%{name}* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png - -%changelog -* Fri Jun 19 2015 Fedora Release Engineering - 0.2.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.2.20-6 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 0.2.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.2.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.2.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.2.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Nov 15 2012 Paul Wouters - 0.2.20-1 -- Updated to 0.2.20 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.2.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 07 2012 Paul Wouters - 0.2.15-1 -- Updated to 0.2.15 -- Don't use --delete-original in desktop-file-install -- Fix obsolete-not-provided vidalia-doc - -* Sun May 22 2011 Chen Lei - 0.2.12-1 -- New upstream release - -* Mon Feb 07 2011 Fedora Release Engineering - 0.2.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 0.2.10-2 -- Rebuilt for gcc bug 634757 - -* Fri Sep 17 2010 Chen Lei - 0.2.10-1 -- New upstream release - -* Wed May 26 2010 Chen Lei - 0.2.9-1 -- New upstream release - -* Wed Apr 21 2010 Chen Lei - 0.2.8-1 -- New upstream release -- Remove -doc subpackage - -* Sun Jan 31 2010 Chen Lei - 0.2.7-2 -- Add contrib to -doc subpackage - -* Sun Jan 31 2010 Chen Lei - 0.2.7-1 -- New upstream release - -* Wed Sep 02 2009 Simon Wesp - 0.15-1 -- New upstream release - -* Fri Aug 21 2009 Tomas Mraz - 0.1.14-3 -- rebuilt with new openssl - -* Sun Jul 26 2009 Fedora Release Engineering - 0.1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild