rpms/ciso/F-13 Makefile.fedora, NONE, 1.1 ciso-1.0.0-chdorb.patch, NONE, 1.1 ciso.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Pierre Dorbais]

Author: chdorb

Update of /cvs/pkgs/rpms/ciso/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2097/F-13

Modified Files:
	.cvsignore sources 
Added Files:
	Makefile.fedora ciso-1.0.0-chdorb.patch ciso.spec import.log 
Log Message:
Initial RPM Release



--- NEW FILE Makefile.fedora ---
DESTDIR     = 
prefix      = /usr
USRBINDIR   = $(DESTDIR)$(prefix)/bin

CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
LDFLAGS = -lz
INSTALL = install

all : ciso
ciso : ciso.o

ciso.o : ciso.c

install :
	$(INSTALL) -m 755 ciso $(USRBINDIR)/ciso

clean:
	rm -rf *.o

ciso-1.0.0-chdorb.patch:
 ciso.c |    6 +++---
 ciso.h |    8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE ciso-1.0.0-chdorb.patch ---
diff -up ciso-1.0.0/ciso.c.chdorb ciso-1.0.0/ciso.c
--- ciso-1.0.0/ciso.c.chdorb	2010-02-09 21:47:57.539407959 +0100
+++ ciso-1.0.0/ciso.c	2010-02-09 21:51:13.835786263 +0100
@@ -138,7 +138,7 @@ int decomp_ciso(void)
 
 	/* show info */
 	printf("Decompress '%s' to '%s'\n",fname_in,fname_out);
-	printf("Total File Size %ld bytes\n",ciso.total_bytes);
+	printf("Total File Size %lld bytes\n",ciso.total_bytes);
 	printf("block size      %d  bytes\n",ciso.block_size);
 	printf("total blocks    %d  blocks\n",ciso_total_block);
 	printf("index align     %d\n",1<<ciso.align);
@@ -279,7 +279,7 @@ int comp_ciso(int level)
 
 	/* show info */
 	printf("Compress '%s' to '%s'\n",fname_in,fname_out);
-	printf("Total File Size %ld bytes\n",ciso.total_bytes);
+	printf("Total File Size %lld bytes\n",ciso.total_bytes);
 	printf("block size      %d  bytes\n",ciso.block_size);
 	printf("index align     %d\n",1<<ciso.align);
 	printf("compress level  %d\n",level);
@@ -304,7 +304,7 @@ int comp_ciso(int level)
 		if(--percent_cnt<=0)
 		{
 			percent_cnt = percent_period;
-			printf("compress %3d%% avarage rate %3d%%\r"
+			printf("compress %3d%% avarage rate %3lld%%\r"
 				,block / percent_period
 				,block==0 ? 0 : 100*write_pos/(block*0x800));
 		}
diff -up ciso-1.0.0/ciso.h.chdorb ciso-1.0.0/ciso.h
--- ciso-1.0.0/ciso.h.chdorb	2010-02-09 21:46:13.516003275 +0100
+++ ciso-1.0.0/ciso.h	2010-02-09 21:46:13.520509442 +0100
@@ -25,12 +25,16 @@
 /*
 	complessed ISO(9660) header format
 */
+#include <stdint.h>
+#include <string.h>
+
+
 typedef struct ciso_header
 {
 	unsigned char magic[4];			/* +00 : 'C','I','S','O'                 */
-	unsigned long header_size;		/* +04 : header size (==0x18)            */
+	uint32_t header_size;	     	/* +04 : header size (==0x18)            */
 	unsigned long long total_bytes;	/* +08 : number of original data size    */
-	unsigned long block_size;		/* +10 : number of compressed block size */
+	uint32_t block_size;		    /* +10 : number of compressed block size */
 	unsigned char ver;				/* +14 : version 01                      */
 	unsigned char align;			/* +15 : align of index value            */
 	unsigned char rsv_06[2];		/* +16 : reserved                        */


--- NEW FILE ciso.spec ---
Name:           ciso
Version:        1.0.0
Release:        3%{?dist}
Summary:        ISO to CSO converter

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://ciso.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        Makefile.fedora
Patch0:         ciso-1.0.0-chdorb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel 

%description
A small tool to compress/decompress ISO to/from CSO (Compressed ISO for PSP)

%prep
%setup -q
# Fix file end-line encoding
sed -i 's/\r//' license ciso.h

# Patch for adding missing include string.h, stdint.h
# and use standard integer types to avoid accidental 8 byte value
# when 4 was intended (32bit vs 64bit long) (see Launchpad #163308) into ciso.h
# + fix format string compiler warnings in ciso.c
%patch0 -p1 -b .chdorb

%build
make %{?_smp_mflags} -f %{SOURCE1} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
make DESTDIR=%{buildroot} install 

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc license
%{_bindir}/%{name}

%changelog
* Mon Apr 19 2010 Pierre Dorbais <pierre.dorbais at free.fr> 1.0.0-3
- Add blank lines between changelog entries

* Tue Feb  9 2010 Pierre Dorbais <pierre.dorbais at free.fr> 1.0.0-2
- Source0 URL fixed
- format string compiler warnings fixed

* Sun Oct 18 2009 Pierre Dorbais <pierre.dorbais at free.fr> 1.0.0-1
- Initial RPM release



--- NEW FILE import.log ---
ciso-1_0_0-3_fc12:F-13:ciso-1.0.0-3.fc12.src.rpm:1271881027


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ciso/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Apr 2010 04:13:41 -0000	1.1
+++ .cvsignore	21 Apr 2010 20:17:56 -0000	1.2
@@ -0,0 +1 @@
+ciso-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ciso/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Apr 2010 04:13:42 -0000	1.1
+++ sources	21 Apr 2010 20:17:57 -0000	1.2
@@ -0,0 +1 @@
+6091333f30fd61852d7d629b937aee34  ciso-1.0.0.tar.gz