merge patches into one and use canonical patch file name

pgp2/keygen.patch

@@ -1,3 +1,14 @@
+--- src/system.c.orig	Tue Aug 27 12:53:39 2002
++++ src/system.c	Tue Aug 27 12:53:38 2002
+@@ -344,7 +344,7 @@
+ #if (defined(MACH) || defined(SVR2) || defined(_BSD)) && !defined(NEXT) \
+ && !defined(AUX) && !defined(__MACHTEN__) || (defined(sun) && defined(i386))
+ int remove(name)
+-char *name;
++const char *name;
+ {
+ 	return unlink(name);
+ }
 --- src/mpilib.h.orig	Tue Aug 29 05:03:30 1995
 +++ src/mpilib.h	Fri Oct  6 09:08:35 2000
 @@ -321,7 +321,15 @@

pgp2/pgp2.spec

@@ -38,13 +38,12 @@ Distribution: OpenPKG [PLUS]
 Group:        Cryptography
 License:      GPL
 Version:      %{V_long}
-Release:      20030530
+Release:      20030722
 
 #   list of sources
 Source0:      ftp://ftp.pgpi.org/pub/pgp/%{V_short}/src/pgp%{V_strip}is.tar.gz
 Source1:      language.idx
-Patch0:       keygen.patch
-Patch1:       system.patch
+Patch0:       pgp2.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -73,8 +72,7 @@ AutoReqProv:  no
     #   extract distribution
     %setup -c -n pgp-%{V_long}
     %{l_tar} -xf pgp%{V_strip}ii.tar
-    %patch0 -p0
-    %patch1 -p0
+    %patch -p0
 
     #   patch distribution
     %{l_shtool} subst \

pgp2/system.patch

@@ -1,11 +0,0 @@
---- src/system.c.orig	Tue Aug 27 12:53:39 2002
-+++ src/system.c	Tue Aug 27 12:53:38 2002
-@@ -344,7 +344,7 @@
- #if (defined(MACH) || defined(SVR2) || defined(_BSD)) && !defined(NEXT) \
- && !defined(AUX) && !defined(__MACHTEN__) || (defined(sun) && defined(i386))
- int remove(name)
--char *name;
-+const char *name;
- {
- 	return unlink(name);
- }