From 988236f83801bc62934266322072027590eeab71 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:15:45 +0000 Subject: [PATCH 1/9] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 44983921f933c9be42264b4a37ce196ba314b74d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:41 +0000 Subject: [PATCH 2/9] 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 4f904eece77b9ac35e78b74762142cccd5d053e7 Mon Sep 17 00:00:00 2001 From: supercyper Date: Mon, 1 Feb 2010 16:33:38 +0000 Subject: [PATCH 3/9] *** empty log message *** --- import.log | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 import.log 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 From f094d962896fdff29893ef0e244648892d42be90 Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 2 Feb 2010 11:05:56 +0000 Subject: [PATCH 4/9] *** 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 1ec61a709d1df649c608687c82a8079db78f2ef7 Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 2 Feb 2010 12:00:17 +0000 Subject: [PATCH 5/9] 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 1745953b63dcbc6b733c489479264368ca9fe07d Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:11:39 +0000 Subject: [PATCH 6/9] 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 6b5d9c6d7bd0cdc540e480fe0ec70ec6ab9f30ce Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 21 Apr 2010 03:45:57 +0000 Subject: [PATCH 7/9] 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 599ba48cef3243e0d5e0dd3fed62fe7c6e1a3214 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 26 May 2010 13:08:32 +0000 Subject: [PATCH 8/9] *** 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 46028447f904126aac4ea3a3ce03fb37c92fb17f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:16 +0000 Subject: [PATCH 9/9] 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12