/[packages]/cauldron/advancecomp/current/SOURCES/advancecomp-1.17-mga-fromdos.patch
ViewVC logotype

Contents of /cauldron/advancecomp/current/SOURCES/advancecomp-1.17-mga-fromdos.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 455398 - (show annotations) (download)
Wed Jul 17 22:08:48 2013 UTC (10 years, 9 months ago) by danf
File size: 2069 byte(s) 
- new upstream license is GPLv3+
- enabled bzip2 support with bzip2-compile.patch
- disabled self-check since it fails with bzip2 enabled
- document advzip -N option with option-doc.patch
- use dos2unix instead of fromdos with fromdos.patch which
  adds a new BuildRequires on autoconf/automake
1 Index: advancecomp-1.17/Makefile.am
2 ===================================================================
3 --- advancecomp-1.17/Makefile.am
4 +++ advancecomp-1.17/Makefile.am 2013-07-17 23:19:36.365147375 +0200
5 @@ -216,7 +216,7 @@
6 advd2 man < $(srcdir)/$< > $@
7
8 %.txt : %.d
9 - advd2 txt < $(srcdir)/$< | todos > $@
10 + advd2 txt < $(srcdir)/$< | $(TODOS) > $@
11
12 %.html : %.d
13 advd2 html < $(srcdir)/$< > $@
14 @@ -227,19 +227,19 @@
15 # Archives
16
17 README: doc/readme.txt
18 - cat $< | fromdos > $@
19 + cat $< | $(FROMDOS) > $@
20
21 AUTHORS: doc/authors.txt
22 - cat $< | fromdos > $@
23 + cat $< | $(FROMDOS) > $@
24
25 INSTALL: doc/install.txt
26 - cat $< | fromdos > $@
27 + cat $< | $(FROMDOS) > $@
28
29 HISTORY: doc/history.txt
30 - cat $< | fromdos > $@
31 + cat $< | $(FROMDOS) > $@
32
33 doc/copying.txt: COPYING
34 - cat $< | todos > $@
35 + cat $< | $(TODOS) > $@
36
37 check-local: advzip test/test.lst
38 @cp $(srcdir)/test/archive.zip .
39 @@ -302,7 +302,7 @@
40 $(TESTENV) ./advpng$(EXEEXT) -L basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png basn6a04.png >> check.lst
41 $(TESTENV) ./advdef$(EXEEXT) -f -z -4 basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png basn6a04.png
42 $(TESTENV) ./advpng$(EXEEXT) -L basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png basn6a04.png >> check.lst
43 - cat check.lst | fromdos | cmp $(srcdir)/test/test.lst
44 + cat check.lst | $(FROMDOS) | cmp $(srcdir)/test/test.lst
45 @echo Success!
46
47 DISTDOS_ROOT = \
48 Index: advancecomp-1.17/configure.ac
49 ===================================================================
50 --- advancecomp-1.17/configure.ac
51 +++ advancecomp-1.17/configure.ac 2013-07-17 23:19:31.613167709 +0200
52 @@ -18,6 +18,8 @@
53 AC_CHECK_PROGS(COL, col)
54 AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind --leak-check=full --track-fds=yes --error-exitcode=1],[])
55 AC_CHECK_PROG([WINE],[wine],[wine],[])
56 +AC_CHECK_PROGS(FROMDOS, fromdos dos2unix)
57 +AC_CHECK_PROGS(TODOS, todos unix2dos)
58
59 dnl Checks for libraries.
60 AC_CHECK_LIB([z], [adler32], [], [AC_MSG_ERROR([the libz library is missing])])
  ViewVC Help
Powered by ViewVC 1.1.30