From 0b5eaee68697d9272b79d30f1764bb4b0f8f00c5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 29 Apr 2009 02:51:44 +0000 Subject: [PATCH 01/14] Initialize branch F-11 for vidalia --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 50ccdeeae3039a5ae34c2f6a686a188a640d80f8 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 29 Apr 2009 15:53:22 +0000 Subject: [PATCH 02/14] *** 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..1ea9c7a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372 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 2e6df00278af8487ce9625bc8b0cca1613341fc7 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Mon, 1 Jun 2009 20:18:16 +0000 Subject: [PATCH 03/14] *** 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 1ea9c7a..45011c3 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372 +vidalia-0_1_13-1_fc11:F-11:vidalia-0.1.13-1.fc11.src.rpm:1243887454 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 9c360de6c37c69985c1f080d613cd0619ac86b3c Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 2 Jun 2009 04:47:43 +0000 Subject: [PATCH 04/14] *** 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 ce2263969e2d796c043e3c7b7c16256333ec9458 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 7 Jul 2009 20:40:39 +0000 Subject: [PATCH 05/14] *** 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 45011c3..a8754ae 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372 vidalia-0_1_13-1_fc11:F-11:vidalia-0.1.13-1.fc11.src.rpm:1243887454 +vidalia-0_1_14-1_fc11:F-11:vidalia-0.1.14-1.fc11.src.rpm:1246995467 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 ff38a4cba19e82e606df9038531e641a924de9d4 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 2 Sep 2009 19:39:50 +0000 Subject: [PATCH 06/14] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 11 ++++++++++- 4 files changed, 13 insertions(+), 3 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 a8754ae..2176770 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372 vidalia-0_1_13-1_fc11:F-11:vidalia-0.1.13-1.fc11.src.rpm:1243887454 vidalia-0_1_14-1_fc11:F-11:vidalia-0.1.14-1.fc11.src.rpm:1246995467 +vidalia-0_1_15-1_fc11:F-11:vidalia-0.1.15-1.fc11.src.rpm:1251920336 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 4d18f4b..61248e7 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,5 +1,5 @@ Name: vidalia -Version: 0.1.14 +Version: 0.1.15 Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network @@ -115,6 +115,15 @@ 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 + +* 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 c48051359f7ecdfd7da1ee4813e1409af908c55a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:41 +0000 Subject: [PATCH 07/14] 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 5e43654095b83d248fe0873ef38a39bd09cf13d0 Mon Sep 17 00:00:00 2001 From: supercyper Date: Mon, 1 Feb 2010 16:32:38 +0000 Subject: [PATCH 08/14] *** empty log message *** --- import.log | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 import.log diff --git a/import.log b/import.log deleted file mode 100644 index 2176770..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372 -vidalia-0_1_13-1_fc11:F-11:vidalia-0.1.13-1.fc11.src.rpm:1243887454 -vidalia-0_1_14-1_fc11:F-11:vidalia-0.1.14-1.fc11.src.rpm:1246995467 -vidalia-0_1_15-1_fc11:F-11:vidalia-0.1.15-1.fc11.src.rpm:1251920336 From bb4c06df02f15c5c0c8057fda230be61bd465961 Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 2 Feb 2010 11:07:35 +0000 Subject: [PATCH 09/14] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 2aee953fffdc158bd33dd8c8d94120db4f72f3c2 Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 2 Feb 2010 11:59:48 +0000 Subject: [PATCH 10/14] sync with devel --- vidalia.spec | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index 61248e7..3fae71e 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: 2%{?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 +#polipo can also 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}. @@ -52,33 +53,27 @@ PATH=%{_libdir}/qt4/bin:$PATH; export PATH %cmake . make %{?_smp_mflags} - -cd doc -doxygen Doxyfile.in +make doxygen %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} - -mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ -install -Dpm0644 doc/html/* \ - %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/ + %if 0%{?rhel} + --vendor="" \ + %endif + --dir %{buildroot}%{_datadir}/applications \ + %{SOURCE1} %post @@ -87,8 +82,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 @@ -111,10 +106,15 @@ 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 + * Wed Sep 02 2009 Simon Wesp - 0.15-1 - New upstream release From 59e7cc1952bc8ea6caec07cf053a6674ce624c23 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:11:35 +0000 Subject: [PATCH 11/14] update to 0.2.8 --- sources | 2 +- vidalia.desktop | 2 -- vidalia.spec | 49 +++++++++++++++---------------------------------- 3 files changed, 16 insertions(+), 37 deletions(-) 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 b75df494fd97df6e37a7d6f61ba4fbeaef818d8f Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:46:02 +0000 Subject: [PATCH 12/14] 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 301ef1e7c83d6257fb311ddb91bb51822af40e68 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 26 May 2010 13:08:23 +0000 Subject: [PATCH 13/14] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- vidalia.desktop | 9 ++++----- vidalia.spec | 27 ++++++++++----------------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9915d41..7a3a4f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.2.7.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 9ea1afd..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;KDE;Qt;Security; +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 5bf802292717f5e1c5d8b8a8a8fb7548a1e38ebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:18 +0000 Subject: [PATCH 14/14] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11