* distfiles, gnupg.spec.in: Include convert-from-106.

4 files changed, 21 insertions, 6 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 865ffc2c4..3bca5d92a 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,7 @@
 2002-11-30  David Shaw  <[email protected]>
 
+	* distfiles, gnupg.spec.in: Include convert-from-106.
+
 	* convert-from-106: Script to automate the 1.0.6->later
 	conversion.  It marks all secret keys as ultimately trusted, adds
 	the signature caches, and checks the trustdb.
diff --git a/scripts/convert-from-106 b/scripts/convert-from-106
index 26fe34fc9..b8225d28e 100755
--- a/scripts/convert-from-106
+++ b/scripts/convert-from-106
@@ -1,13 +1,19 @@
 #!/bin/sh
 # Copyright (C) 2002 Free Software Foundation, Inc.
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 gpg="../g10/gpg --no-greeting --no-secmem-warning";
 
diff --git a/scripts/distfiles b/scripts/distfiles
index 0e3d55801..c0e87b1f6 100644
--- a/scripts/distfiles
+++ b/scripts/distfiles
@@ -3,4 +3,5 @@ build-w32
 gnupg.spec.in
 autogen.sh
 mk-gpg-texi
-mk-w32-dist
\ No newline at end of file
+mk-w32-dist
+convert-from-106
diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in
index e62bc817e..4f0d41fcc 100644
--- a/scripts/gnupg.spec.in
+++ b/scripts/gnupg.spec.in
@@ -24,13 +24,18 @@ Provides: gpg openpgp
 BuildRoot: /tmp/rpmbuild_%{name}
 
 %changelog
+* Sat Nov 30 2002 David Shaw <[email protected]>
+- Add convert-from-106 script
+
 * Sat Oct 26 2002 David Shaw <[email protected]>
 - Use new path for keyserver helpers.
 - /usr/lib is no longer used for cipher/hash plugins.
 - Include gpgv, gpgsplit, and the new gnupg.7 man page.
+
 * Fri Apr 19 2002 David Shaw <[email protected]>
 - Removed OPTIONS and pubring.asc - no longer used
 - Added doc/samplekeys.asc
+
 * Sun Mar 31 2002 David Shaw <[email protected]>
 - Added the gpgkeys_xxx keyserver helpers.
 - Added a * to catch variations on the basic gpg man page (gpg, gpgv).
@@ -165,6 +170,7 @@ make install-strip prefix=$RPM_BUILD_ROOT/usr
 %doc %attr (-,root,root) doc/HACKING
 %doc %attr (-,root,root) doc/OpenPGP
 %doc %attr (-,root,root) doc/samplekeys.asc
+%doc %attr (0755,root,root) scripts/convert-from-106
 
 %attr (-,root,root) /usr/man/man1/gpg*.1*
 %attr (-,root,root) /usr/man/man7/gnupg.7*