This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2004-02-04 23:39:08 UTC Jan Rękorajski <baggins@pld-linux.org> '- merged alpha and LFS patches (it all comes to types)'
Cherrypick from master 2008-08-25 11:49:36 UTC areq <areq@pld-linux.org> '- 1.3.13':
    cksfv.spec -> 1.29
Delete:
    cksfv-alpha.patch

diff --git a/cksfv-alpha.patch b/cksfv-alpha.patch
deleted file mode 100644 (file)
index ff2bfc3..0000000
--- a/cksfv-alpha.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur cksfv-1.2/src/crc32.c cksfv-1.2.64/src/crc32.c
---- cksfv-1.2/src/crc32.c      Fri Dec 29 01:34:33 2000
-+++ cksfv-1.2.64/src/crc32.c   Fri Oct 12 16:15:29 2001
-@@ -23,7 +23,11 @@
- 
- #define BUFFERSIZE 16384   /* (16k) buffer size for reading from the file */
- 
-+#ifdef __alpha__
-+static const unsigned int crctable[256] = {
-+#else
- static const unsigned long crctable[256] = {
-+#endif
-   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
-   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-   0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-@@ -91,11 +95,19 @@
- };
- 
- 
-+#ifdef __alpha__
-+int crc32(register int fd, unsigned int *main_val, unsigned int *main_len)
-+#else
- int crc32(register int fd, unsigned long *main_val, unsigned long *main_len)
-+#endif
- {
-   char                  buf[BUFFERSIZE], *p;
-   int                   len = 0, nr;
-+#ifdef __alpha__
-+  unsigned int         crc = ~0, crc32_total = ~0;
-+#else
-   unsigned long         crc = ~0, crc32_total = ~0;
-+#endif
-       
-   while ((nr = read(fd, buf, sizeof(buf))) > 0)
-     for (len += nr, p = buf; nr--; ++p) {
-diff -ur cksfv-1.2/src/newsfv.c cksfv-1.2.64/src/newsfv.c
---- cksfv-1.2/src/newsfv.c     Fri Dec 29 01:34:33 2000
-+++ cksfv-1.2.64/src/newsfv.c  Fri Oct 12 16:18:11 2001
-@@ -24,14 +24,23 @@
- 
- extern void pnsfv_head();
- extern void pfileinfo(char**);
-+#ifdef __alpha__
-+extern void pcrc(char*, unsigned int);
-+extern int  crc32(int, unsigned int*, unsigned int*);
-+#else
- extern void pcrc(char*, unsigned long);
- extern int  crc32(int, unsigned long*, unsigned long*);
-+#endif
- 
- int newsfv(char **argv)
- {
-   int           fd, rval = 0;
-   char          *fn;
-+#ifdef __alpha__
-+  unsigned int len, val;
-+#else
-   unsigned long len, val;
-+#endif
-   
-   pnsfv_head();
-   pfileinfo(argv);
-diff -ur cksfv-1.2/src/print.c cksfv-1.2.64/src/print.c
---- cksfv-1.2/src/print.c      Fri Dec 29 01:34:33 2000
-+++ cksfv-1.2.64/src/print.c   Fri Oct 12 16:18:43 2001
-@@ -58,10 +58,17 @@
-   }
- }
- 
-+#ifdef __alpha__
-+void pcrc(char *fn, unsigned int val)
-+{
-+  printf("%s %.8X\n", fn, val);
-+}
-+#else
- void pcrc(char *fn, unsigned long val)
- {
-   printf("%s %.8lX\n", fn, val);
- }
-+#endif
- 
- void prsfv_head(char *fn)
- {
-diff -ur cksfv-1.2/src/readsfv.c cksfv-1.2.64/src/readsfv.c
---- cksfv-1.2/src/readsfv.c    Fri Dec 29 01:34:33 2000
-+++ cksfv-1.2.64/src/readsfv.c Fri Oct 12 16:19:31 2001
-@@ -28,7 +28,11 @@
- #include <dirent.h>
- #include <stdlib.h>
- 
-+#ifdef __alpha__
-+extern int  crc32(int, unsigned int*, unsigned int*);
-+#else
- extern int  crc32(int, unsigned long*, unsigned long*);
-+#endif
- extern void prsfv_head(char*);
- 
- int find_file(char*, char*);
-@@ -39,7 +43,11 @@
-   FILE          *fd;
-   char          buf[512], *end, filename[512], crc[9], path[256];
-   int           file, rval = 0;
-+#ifdef __alpha__
-+  unsigned int len, val, sfvcrc;
-+#else
-   unsigned long len, val, sfvcrc;
-+#endif
-   
-   if (quiet == 0) {
-     prsfv_head(fn);

diff --git a/cksfv.spec b/cksfv.spec
index f8b5bc5e6a23e32bab391e0cb939424855365413..553151db1b95d33a44f6a7e5dfad6732bc956799 100644 (file)
--- a/cksfv.spec
+++ b/cksfv.spec
@@ -1,37 +1,40 @@
 Summary:       Test archives using information from .sfv
-Summary(pl):   Testuje archiwa u¿ywaj±c infomacji z .sfv
+Summary(pl.UTF-8):     Testowanie archiwów z użyciem informacji z plików .sfv
 Name:          cksfv
-Version:       1.3
-Release:       3
+Version:       1.3.13
+Release:       1
 License:       GPL
-Group:         Applications/Archiving
 Vendor:                Bryan Call <bc@fodder.org>
-URL:           http://www.fodder.org/cksfv/
-Source0:       http://www.fodder.org/cksfv/%{name}-%{version}.tar.gz
-# Source0-md5: e00cf6a80a566539eb6f3432f2282c38
-Patch0:                %{name}-LFS.patch
+Group:         Applications/Archiving
+Source0:       http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/%{name}-%{version}.tar.bz2
+# Source0-md5: a6d7e4f2dc267e670ebb48eb8b806993
+URL:           http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Utility to test .sfv files. These files are commonly used to ensure
 the correct retrieval or storage of data.
 
-%description -l pl
-Narzêdzie do testowania plików .sfv. Te pliki s± czêsto u¿ywane w celu
-upewnienia siê o poprawnym przesyle danych poprzez sieæ.
+%description -l pl.UTF-8
+Narzędzie do testowania plików .sfv. Te pliki są często używane w celu
+upewnienia się o poprawnym przesyle danych poprzez sieć.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__make} CFLAGS="%{rpmcflags} -D_LARGEFILE64_SOURCE" VERSION=%{version} -C src
+./configure \
+       --prefix=/usr \
+       --package-prefix=$RPM_BUILD_ROOT
+
+%{__make} all check \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
 
-install src/cksfv $RPM_BUILD_ROOT%{_bindir}
+%{__make} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,3 +43,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*