From aec55984eaa0488a05ec1b50263432c90f3ca52c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 29 Apr 2009 02:51:45 +0000 Subject: [PATCH 1/6] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 74a0d9087350909d66b5d2b9e68ef7ddfbe74d21 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 29 Apr 2009 15:55:28 +0000 Subject: [PATCH 2/6] *** 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..bc8d771 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vidalia-0_1_12-1_fc11:F-10:vidalia-0.1.12-1.fc11.src.rpm:1241020471 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 e1365f0b6eb0f76779d7a05984c6e44445e4f385 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 7 Jul 2009 20:40:41 +0000 Subject: [PATCH 3/6] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 22 +++++++++++++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1982f70..3afe7a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vidalia-0.1.12.tar.gz +vidalia-0.1.14.tar.gz diff --git a/import.log b/import.log index bc8d771..eb18098 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ vidalia-0_1_12-1_fc11:F-10:vidalia-0.1.12-1.fc11.src.rpm:1241020471 +vidalia-0_1_14-1_fc11:F-10:vidalia-0.1.14-1.fc11.src.rpm:1246998216 diff --git a/sources b/sources index a6e153f..d09a33b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5820043228e7303fa4bee714bd839804 vidalia-0.1.12.tar.gz +342990326e761c95b29d999dfb8ef02f vidalia-0.1.14.tar.gz diff --git a/vidalia.spec b/vidalia.spec index b8be530..4d18f4b 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,5 +1,5 @@ Name: vidalia -Version: 0.1.12 +Version: 0.1.14 Release: 1%{?dist} Summary: GUI controller for the Tor Onion Routing Network @@ -43,7 +43,14 @@ Doxygen generated documentations for %{name}. %build +%if 0%{?_qt4_bindir:1} +PATH=%{_qt4_bindir}:$PATH; export PATH +%else +PATH=%{_libdir}/qt4/bin:$PATH; export PATH +%endif + %cmake . + 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,16 @@ 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 + +* 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 dba55e59fcaeec979599679ba6ca0f1eb60a4bf5 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 2 Sep 2009 19:41:33 +0000 Subject: [PATCH 4/6] *** 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 eb18098..4ae2549 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ vidalia-0_1_12-1_fc11:F-10:vidalia-0.1.12-1.fc11.src.rpm:1241020471 vidalia-0_1_14-1_fc11:F-10:vidalia-0.1.14-1.fc11.src.rpm:1246998216 +vidalia-0_1_15-1_fc11:F-10:vidalia-0.1.15-1.fc11.src.rpm:1251920458 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 8f8e3ac15095c223f02a8c02d4a84f465787b4ef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:40 +0000 Subject: [PATCH 5/6] 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 d415312d0326f041b69de981fa05d01773218f5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:16 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 3 --- 4 files changed, 25 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 4ae2549..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -vidalia-0_1_12-1_fc11:F-10:vidalia-0.1.12-1.fc11.src.rpm:1241020471 -vidalia-0_1_14-1_fc11:F-10:vidalia-0.1.14-1.fc11.src.rpm:1246998216 -vidalia-0_1_15-1_fc11:F-10:vidalia-0.1.15-1.fc11.src.rpm:1251920458