[packages/toilet] - updated to 0.3 - updated make patch - added am patch (fixes build with automake 1.13)

qboosh qboosh at pld-linux.org
Fri Feb 15 16:20:20 CET 2013


commit 04c717a6a2dd6dc452178814a8fd83e7910579b6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Feb 15 16:20:17 2013 +0100

    - updated to 0.3
    - updated make patch
    - added am patch (fixes build with automake 1.13)

 toilet-am.patch   | 11 +++++++++++
 toilet-make.patch |  9 ---------
 toilet.spec       | 16 +++++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/toilet.spec b/toilet.spec
index 53af003..7485e9a 100644
--- a/toilet.spec
+++ b/toilet.spec
@@ -1,20 +1,21 @@
 Summary:	TOIlet - free replacement for FIGlet utility
 Summary(pl.UTF-8):	TOIlet - wolnodostępny zamiennik narzędzia FIGlet
 Name:		toilet
-Version:	0.1
-Release:	3
+Version:	0.3
+Release:	1
 License:	WTFPL
 Group:		Applications/Graphics
-Source0:	http://libcaca.zoy.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	7d26ca36c83eeca2f0c285872624c2c8
+Source0:	http://caca.zoy.org/raw-attachment/wiki/toilet/%{name}-%{version}.tar.gz
+# Source0-md5:	9b72591cb22a30c42a3184b17cabca6f
 Patch0:		%{name}-make.patch
-URL:		http://libcaca.zoy.org/toilet.html
+Patch1:		%{name}-am.patch
+URL:		http://caca.zoy.org/wiki/toilet
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libcaca-devel >= 0.99-0.beta10
+BuildRequires:	libcaca-devel >= 0.99-0.beta18
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
-Requires:	libcaca >= 0.99-0.beta10
+Requires:	libcaca >= 0.99-0.beta18
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,6 +48,7 @@ możliwości:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
diff --git a/toilet-am.patch b/toilet-am.patch
new file mode 100644
index 0000000..e9627bd
--- /dev/null
+++ b/toilet-am.patch
@@ -0,0 +1,11 @@
+--- toilet-0.3/configure.ac.orig	2013-02-15 16:15:46.988905389 +0100
++++ toilet-0.3/configure.ac	2013-02-15 16:17:07.148902025 +0100
+@@ -7,7 +7,7 @@
+ AC_CANONICAL_SYSTEM
+ 
+ AM_INIT_AUTOMAKE(toilet, 0.3)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
diff --git a/toilet-make.patch b/toilet-make.patch
index d516cf2..3b9c8b6 100644
--- a/toilet-make.patch
+++ b/toilet-make.patch
@@ -1,12 +1,3 @@
---- toilet-0.1/src/Makefile.am.orig	2006-11-10 11:47:29.000000000 +0100
-+++ toilet-0.1/src/Makefile.am	2006-12-04 23:23:23.152346378 +0100
-@@ -9,5 +9,5 @@
- 	term.c figlet.c
- toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
- toilet_CFLAGS = `pkg-config --cflags cucul`
--toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
-+toilet_LDADD = $(cucul_LIBS) @GETOPT_LIBS@ @ZLIB_LIBS@
- 
 --- toilet-0.1/configure.ac.orig	2006-11-16 01:26:50.000000000 +0100
 +++ toilet-0.1/configure.ac	2006-12-04 23:24:11.691112444 +0100
 @@ -67,7 +67,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/toilet.git/commitdiff/04c717a6a2dd6dc452178814a8fd83e7910579b6



More information about the pld-cvs-commit mailing list