From c175067cffba7fa3a7017f920088904aa9fcb400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 1 Jun 2009 18:21:47 +0000 Subject: [PATCH 1/9] Initialize branch EL-5 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..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 6701ef93508de4ffd0104fce6e8320011531dc0d Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Mon, 1 Jun 2009 19:57:16 +0000 Subject: [PATCH 2/9] *** 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..6e43ce7 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_el5:EL-5:vidalia-0.1.13-1.el5.src.rpm:1243885866 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 80981d644446d22dbf8510ca648ecc362ebf7190 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Jun 2009 20:50:01 +0000 Subject: [PATCH 3/9] fix build for epel (lacking %%_qt4_bindir, make a good guess) --- vidalia.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index aac86f8..1238f62 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -43,13 +43,15 @@ Doxygen generated documentations for %{name}. %build - %if 0%{?fedora} -%cmake . - %endif - %if 0%{?rhel} -%cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake . - %endif +# ensure we find qt4 tools, like qmake, moc, etc... +%if 0%{?_qt4_bindir:1} +PATH=%{_qt4_bindir}:$PATH; export PATH +%else +PATH=%{_libdir}/qt4/bin:$PATH; export PATH +%endif + +%cmake . make %{?_smp_mflags} From 15ae6080890be2af16807e822df88ea52d418028 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 2 Jun 2009 04:47:27 +0000 Subject: [PATCH 4/9] *** empty log message *** --- vidalia.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vidalia.spec b/vidalia.spec index 1238f62..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,8 +43,6 @@ Doxygen generated documentations for %{name}. %build - -# ensure we find qt4 tools, like qmake, moc, etc... %if 0%{?_qt4_bindir:1} PATH=%{_qt4_bindir}:$PATH; export PATH %else @@ -117,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 19fceaead0545a74654ff5239df3194e36ad947e Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Tue, 7 Jul 2009 20:43:07 +0000 Subject: [PATCH 5/9] *** 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 6e43ce7..3dbecf4 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_el5:EL-5:vidalia-0.1.13-1.el5.src.rpm:1243885866 +vidalia-0_1_14-1_fc11:EL-5:vidalia-0.1.14-1.fc11.src.rpm:1246999238 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 4c1ec58e6fdd5d170dfeaac20c45064c85743994 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 2 Sep 2009 19:43:34 +0000 Subject: [PATCH 6/9] *** empty log message *** --- import.log | 1 + vidalia.spec | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index 3dbecf4..bd4b56f 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_el5:EL-5:vidalia-0.1.13-1.el5.src.rpm:1243885866 vidalia-0_1_14-1_fc11:EL-5:vidalia-0.1.14-1.fc11.src.rpm:1246999238 +vidalia-0_1_15-1_fc11:EL-5:vidalia-0.1.15-1.fc11.src.rpm:1251920542 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 3a0a2d9862f8160de54c9283dec37d9299c5d828 Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Wed, 2 Sep 2009 20:20:44 +0000 Subject: [PATCH 7/9] *** empty log message *** --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- vidalia.spec | 5 ++++- 4 files changed, 7 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 bd4b56f..60ee5b9 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_el5:EL-5:vidalia-0.1.13-1.el5.src.rpm:1243885866 vidalia-0_1_14-1_fc11:EL-5:vidalia-0.1.14-1.fc11.src.rpm:1246999238 vidalia-0_1_15-1_fc11:EL-5:vidalia-0.1.15-1.fc11.src.rpm:1251920542 +vidalia-0_1_15-2_fc11:EL-5:vidalia-0.1.15-2.fc11.src.rpm:1251922762 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 61248e7..c09c93e 100644 --- a/vidalia.spec +++ b/vidalia.spec @@ -1,6 +1,6 @@ Name: vidalia Version: 0.1.15 -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 +* Wed Sep 02 2009 Simon Wesp - 0.15-2 +- Rebuild for epel + * Wed Sep 02 2009 Simon Wesp - 0.15-1 - New upstream release From e5a6e60d4e5947d5dd32f9e5e831be9166638863 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:39 +0000 Subject: [PATCH 8/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 793be41fbac757ceccfda7366cb08123c5a58060 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 - import.log | 5 ----- 4 files changed, 27 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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index 60ee5b9..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_el5:EL-5:vidalia-0.1.13-1.el5.src.rpm:1243885866 -vidalia-0_1_14-1_fc11:EL-5:vidalia-0.1.14-1.fc11.src.rpm:1246999238 -vidalia-0_1_15-1_fc11:EL-5:vidalia-0.1.15-1.fc11.src.rpm:1251920542 -vidalia-0_1_15-2_fc11:EL-5:vidalia-0.1.15-2.fc11.src.rpm:1251922762