diff --git a/dumpasn1.spec b/dumpasn1.spec index bd054cf..7edf9f0 100644 --- a/dumpasn1.spec +++ b/dumpasn1.spec @@ -1,6 +1,6 @@ Name: dumpasn1 -Version: 20100318 -Release: 2%{?dist} +Version: 20101112 +Release: 1%{?dist} Summary: ASN.1 object dump utility Group: Development/Tools @@ -12,7 +12,6 @@ Source0: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.c Source1: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg # man page extracted from http://ftp.debian.org/debian/pool/main/d/dumpasn1/dumpasn1_20030222-1.diff.gz Source2: dumpasn1.1 -Patch0: dumpasn1_fix_BYTE.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,7 @@ formats. %prep %setup -q -c -T install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} . -%patch0 + sed -i -e 's|/etc/dumpasn1/|%{_sysconfdir}/dumpasn1/|' dumpasn1.{c,1} %build @@ -54,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 04 2011 F. Kooman - 20101112-1 +- update to 20101112 (dumpasn1) and 20110201 (dumpasn1.cfg) + * Fri Aug 20 2010 Adam Tkac - 20100318-2 - rebuild to ensure F14 has higher NVR than F13 diff --git a/dumpasn1_fix_BYTE.patch b/dumpasn1_fix_BYTE.patch deleted file mode 100644 index 17c404b..0000000 --- a/dumpasn1_fix_BYTE.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- dumpasn1.c.orig 2010-04-24 11:52:40.000000000 +0200 -+++ dumpasn1.c 2010-06-11 14:37:38.628043182 +0200 -@@ -156,6 +156,10 @@ - #define min(a,b) ( ( a ) < ( b ) ? ( a ) : ( b ) ) - #endif /* !min */ - -+#ifndef BYTE -+ typedef unsigned char BYTE; -+#endif -+ - /* Macros to avoid problems with sign extension */ - - #define byteToInt( x ) ( ( unsigned char ) ( x ) ) diff --git a/sources b/sources index f997668..2a03b74 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e878e123d71d8f593606a6ac41950713 dumpasn1.c -aee570878bd45d8fcb825c06b813d891 dumpasn1.cfg +fe33ce35cf953a3e40417f32f449adaf dumpasn1.c +5364030c58cc67cdfd2650894a5154e0 dumpasn1.cfg ed16a714c3abe387122c6870f1c8aa49 dumpasn1.1