dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 12:12:18 +00:00 · 2009-11-26 01:33:13 +00:00 · 2008-02-09 15:12:57 +00:00 · 2007-11-16 18:13:37 +00:00 · 2007-10-05 16:44:21 +00:00
3 changed files with 26 additions and 36 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: corkscrew
-# $Id$
-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
-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)
--- 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:	8%{?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,32 @@ 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
+* Sat Feb 09 2008 Debarshi Ray <rishi@fedoraproject.org> - 2.0-8
+- Rebuilding with gcc-4.3 in Rawhide.
+
+* Fri Nov 16 2007 Debarshi Ray <rishi@fedoraproject.org> - 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 <rishi@fedoraproject.org> - 2.0-6
 - Moved the online manual page from Patch0 to Source1.
Author	SHA1	Message	Date
Fedora Release Engineering	f9b5402fcf	dist-git conversion	2010-07-28 12:12:18 +00:00
Bill Nottingham	77382665bc	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:33:13 +00:00
Debarshi Ray	80059d19aa	Updated to 2.0-8 in F-8. Modified Files: corkscrew.spec	2008-02-09 15:12:57 +00:00
Debarshi Ray	25f6d7d6f4	Updated to 2.0-7 in F-8. Modified Files: corkscrew.spec	2007-11-16 18:13:37 +00:00
Kevin Fenzi	260dc1b5d5	Initialize branch F-8 for corkscrew	2007-10-05 16:44:21 +00:00