rpms/dumpasn1/devel change_byte_to_char.diff, NONE, 1.1 dumpasn1.spec, 1.12, 1.13 sources, 1.10, 1.11

[François Kooman]

Author: fkooman

Update of /cvs/pkgs/rpms/dumpasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv711

Modified Files:
	dumpasn1.spec sources 
Added Files:
	change_byte_to_char.diff 
Log Message:
* Fri Jul 17 2009 François Kooman <fkooman at tuxed.net> - 20090318-2
- cfg file already has unix line endings
- create patch instead of using sed to replace BYTE with char
 
* Thu Jul 16 2009 François Kooman <fkooman at tuxed.net> - 20090318-1
- Update to 20090318 and config to 20090531



change_byte_to_char.diff:
 dumpasn1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE change_byte_to_char.diff ---
--- dumpasn1.c.orig	2009-07-10 10:21:20.000000000 +0200
+++ dumpasn1.c	2009-07-17 13:21:28.963825607 +0200
@@ -1969,7 +1969,7 @@
 	{
 	OIDINFO *oidInfo;
 	STR_OPTION stringType;
-	BYTE buffer[ MAX_OID_SIZE ];
+	char buffer[ MAX_OID_SIZE ];
 	long value;
 
 	if( ( item->id & CLASS_MASK ) != UNIVERSAL )


Index: dumpasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/dumpasn1.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dumpasn1.spec	24 Feb 2009 12:59:49 -0000	1.12
+++ dumpasn1.spec	21 Jul 2009 18:01:40 -0000	1.13
@@ -1,15 +1,20 @@
 Name:           dumpasn1
-Version:        20090107
+Version:        20090318
 Release:        2%{?dist}
 Summary:        ASN.1 object dump utility
 
 Group:          Development/Tools
 License:        Copyright only
+#   You can use this code in whatever way you want, as long as you don't try
+#   to claim you wrote it.
 URL:            http://www.cs.auckland.ac.nz/~pgut001/
 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
+# somehow "char" got replaced by "BYTE" in 20090318, reverting back to char 
+# makes it compile again, probably because of wide char support
+Patch0:         change_byte_to_char.diff 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -22,16 +27,14 @@ formats.
 
 %prep
 %setup -q -c -T
-install -pm 644 %{SOURCE0} %{SOURCE2} .
+install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} .
+%patch0
 sed -i -e 's|/etc/dumpasn1/|%{_sysconfdir}/dumpasn1/|' dumpasn1.{c,1}
-sed -e 's/\r//g' %{SOURCE1} > dumpasn1.cfg
-
 
 %build
 # -std=c99 for fwide
 %{__cc} $RPM_OPT_FLAGS -std=c99 -DDEBIAN -o dumpasn1 dumpasn1.c
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 dumpasn1 $RPM_BUILD_ROOT%{_bindir}/dumpasn1
@@ -52,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 17 2009 François Kooman <fkooman at tuxed.net> - 20090318-2
+- cfg file already has unix line endings
+- create patch instead of using sed to replace BYTE with char
+ 
+* Thu Jul 16 2009 François Kooman <fkooman at tuxed.net> - 20090318-1
+- Update to 20090318 and config to 20090531
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090107-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	22 Feb 2009 17:28:24 -0000	1.10
+++ sources	21 Jul 2009 18:01:40 -0000	1.11
@@ -1,2 +1,2 @@
-bfbe78b0df2d76d70b3b5d7678950d89  dumpasn1.c
-cddea448af74f0f07dc8f05b326a9c2f  dumpasn1.cfg
+b25f4feca205915b4ba3587b9355d47c  dumpasn1.c
+81a057e27e8584001d93d2852dc4f096  dumpasn1.cfg