From 260dc1b5d5d6d0e98fa0a1a5cf9ece06eddd20a9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 5 Oct 2007 16:44:21 +0000 Subject: [PATCH 1/5] Initialize branch F-8 for corkscrew --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 25f6d7d6f48e94d05c7f2079690ceb70e36c0e8a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 16 Nov 2007 18:13:37 +0000 Subject: [PATCH 2/5] Updated to 2.0-7 in F-8. Modified Files: corkscrew.spec --- corkscrew.spec | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/corkscrew.spec b/corkscrew.spec index 9ffd62b..643068b 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,17 +1,17 @@ -Summary: Tool for tunneling SSH through HTTP proxies -Name: corkscrew -Version: 2.0 -Release: 6%{dist} -License: GPLv2 -Group: Applications/Internet -URL: http://www.agroman.net/corkscrew/ -Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz -Source1: %{name}.1 +Summary: Tool for tunneling SSH through HTTP proxies +Name: corkscrew +Version: 2.0 +Release: 7%{?dist} +License: GPLv2 +Group: Applications/Internet +URL: http://www.agroman.net/corkscrew/ +Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz +Source1: %{name}.1 -Patch0: %{name}-%{version}-from-debian.patch -Patch1: %{name}-%{version}-typo.patch +Patch0: %{name}-%{version}-from-debian.patch +Patch1: %{name}-%{version}-typo.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Corkscrew is a tool for tunneling SSH through HTTP proxies. @@ -35,21 +35,29 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -make install DESTDIR=$RPM_BUILD_ROOT +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT # man page -install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README +%doc TODO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %changelog +* Fri Nov 16 2007 Debarshi Ray - 2.0-7 +- Fixed the value of Release according to Fedora dist tag guidelines. +- Preserved timestamps using 'install -p'. + * Fri Aug 03 2007 Debarshi Ray - 2.0-6 - Moved the online manual page from Patch0 to Source1. From 80059d19aaaf6ac7a92014aa850f5ecc42301462 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sat, 9 Feb 2008 15:12:57 +0000 Subject: [PATCH 3/5] Updated to 2.0-8 in F-8. Modified Files: corkscrew.spec --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 643068b..14858be 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.agroman.net/corkscrew/ @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1.gz %changelog +* Sat Feb 09 2008 Debarshi Ray - 2.0-8 +- Rebuilding with gcc-4.3 in Rawhide. + * Fri Nov 16 2007 Debarshi Ray - 2.0-7 - Fixed the value of Release according to Fedora dist tag guidelines. - Preserved timestamps using 'install -p'. From 77382665bc2ffbba4b7387dcd51f3f7081e8c7cc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:13 +0000 Subject: [PATCH 4/5] 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 f9a56a0..53fc4c5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: corkscrew -# $Id$ +# $Id: Makefile,v 1.1 2007/06/11 23:15:25 kevin Exp $ NAME := corkscrew 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 f9b5402fcf597026f0ddd12e1a29a29ec2b12d5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:12:18 +0000 Subject: [PATCH 5/5] 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 53fc4c5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: corkscrew -# $Id: Makefile,v 1.1 2007/06/11 23:15:25 kevin Exp $ -NAME := corkscrew -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8