env hack to be able to disable .gitignore generation

diff --git a/cvs-fast-export.spec b/cvs-fast-export.spec
index 9e5f1b96185f5fafe0f6c81f2df10ab52dd1e568..0fba5e5976441603293799cff8bd3ffc99ead231 100644 (file)
--- a/cvs-fast-export.spec
+++ b/cvs-fast-export.spec
@@ -11,6 +11,7 @@ License:      GPL v2
 Group:         Development/Version Control
 Source0:       http://www.catb.org/~esr/cvs-fast-export/%{name}-%{version}.tar.gz
 # Source0-md5: 7bc950e2853df9736c638226df1bd79e
+Patch0:                hack-disable-cvsignore.patch
 URL:           http://www.catb.org/~esr/cvs-fast-export/
 BuildRequires: asciidoc
 BuildRequires: sed >= 4.0
@@ -45,6 +46,7 @@ ze zdalnych serwerów CVS.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' cvsconvert cvsreduce
 

diff --git a/hack-disable-cvsignore.patch b/hack-disable-cvsignore.patch
new file mode 100644 (file)
index 0000000..44b4970
--- /dev/null
+++ b/hack-disable-cvsignore.patch
@@ -0,0 +1,16 @@
+
+allow disabling .gitignore generation via env
+
+--- cvs-fast-export-1.40/export.c~     2015-11-21 23:16:26.000000000 +0200
++++ cvs-fast-export-1.40/export.c      2016-10-13 21:10:26.557838474 +0300
+@@ -491,8 +491,10 @@
+       }
+       if (need_ignores) {
+           need_ignores = false;
++          if (!getenv("DISABLE_GITIGNORE")) {
+           printf("M 100644 inline .gitignore\ndata %zd\n%s\n",
+                  sizeof(CVS_IGNORES)-1, CVS_IGNORES);
++          }
+       }
+       if (revpairs != NULL && strlen(revpairs) > 0)
+       {