Hello community,

here is the log from the commit of package figlet for openSUSE:Factory
checked in at Wed Jul 20 09:52:36 CEST 2011.



--------
--- figlet/figlet.changes       2011-03-08 14:36:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/figlet/figlet.changes  2011-07-16 
21:09:42.000000000 +0200
@@ -1,0 +2,38 @@
+Sat Jul 16 18:49:38 UTC 2011 - [email protected]
+
+- Update to version 2.2.4:
+  * Add support to Sam Hocevar's TOIlet TLF fonts containing UTF-8
+    encoded Unicode characters.
+  * Add infocode 5 to list supported font formats
+  * Fix rendering error caused by the previous attempt to fix invalid
+    memory accesses when smushing at start of line
+  * New environment variable FIGLET_FONTDIR can be used to specify
+    the path to search for fonts
+  * Add regression tests
+  From 2.2.3:
+  * License changed from "Academic Free License" to "New BSD License"
+    (3-clause) as agreed by FIGlet authors
+  * New JIS X 0201 control file (Micah Cowan)
+  * Fix behavior of JIS0201 SHIFT-OUT and SHIFT-IN that were previouly
+    inverted (Micah Cowan)
+  * Fix memory violation when smushing at line start
+  * Fix handling of memory allocation errors
+  * Relicense Ed Hamrick zipio under the MIT license. This should
+    eliminate any concerns about redistribution of FIGlet as libre
+    software.
+  * Update Makefile to meet modern standards in variable naming, using
+    BINDIR as the pathname for binary files and reservind DESTDIR
+    as the extra prefix commonly used in package building.
+  * Add a Turbo C makefile, just because I had the compiler. (this
+    also tests portability to old compilers and foreign platforms)
+  * Add Jonathon Abbott's man pages for figlist, showfigfonts and
+    chkfont originally contributed to the Debian Project
+- Spec file updates:
+  * Changes based on spec-cleaner run.
+  * Changed License: to BSD-3-Clause.
+  * Install binaries in /usr/bin and fonts in /usr/share/figlet.
+  * Minor other updates.
+- Rebased figlet-config.patch to apply cleanly.
+- Removed figlet-random.patch and figlet-implicit.patch (fixed upstream).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  contributed.tar.bz2
  figlet-implicit.patch
  figlet-random.patch
  figlet222-patched.tar.bz2
  figlet222.tar.bz2
  international.tar.bz2
  ours.tar.bz2

New:
----
  contributed.tar.gz
  figlet-2.2.4-patched.tar.bz2
  figlet-2.2.4.tar.gz
  international.tar.gz
  ours.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ figlet.spec ++++++
--- /var/tmp/diff_new_pack.P4P0eD/_old  2011-07-20 09:42:05.000000000 +0200
+++ /var/tmp/diff_new_pack.P4P0eD/_new  2011-07-20 09:42:05.000000000 +0200
@@ -19,31 +19,30 @@
 
 
 Name:           figlet
-# Patched code is built by default.
-# Use rpmbuild -D 'BUILD_ORIG 1' to build original code.
+Version:        2.2.4
+Release:        1
+License:        BSD-3-Clause
+Summary:        Tool for Creating Cool ASCII-Art Signatures
 Url:            http://www.figlet.org/
-License:        AFLv2.1
 Group:          Productivity/Text/Utilities
-AutoReqProv:    on
-Version:        2.2.2
-Release:        149
-Summary:        Tool for Creating Cool ASCII-Art Signatures
+# Patched code is built by default.
+# Use rpmbuild -D 'BUILD_ORIG 1' to build original code.
 %if 0%{?BUILD_ORIG}
-Source0:        figlet222.tar.bz2
+Source0:        
ftp://ftp.figlet.org/pub/figlet/program/unix/%{name}-%{version}.tar.gz
 %else
-# WARNING: This is not a comment, but a real command to repack souce:
-#%(sh %{_sourcedir}/%{name}-licpatch.sh %{_sourcedir})
-Source0:        figlet222-patched.tar.bz2
+# WARNING: This is not a comment, but a real command to repack source:
+#%(sh %{_sourcedir}/figlet-licpatch.sh %{_sourcedir})
+Source0:        %{name}-%{version}-patched.tar.bz2
 %endif
-Source1:        contributed.tar.bz2
-Source2:        international.tar.bz2
-Source3:        ours.tar.bz2
+Source1:        ftp://ftp.figlet.org/pub/figlet/fonts/contributed.tar.gz
+Source2:        ftp://ftp.figlet.org/pub/figlet/fonts/international.tar.gz
+Source3:        ftp://ftp.figlet.org/pub/figlet/fonts/ours.tar.gz
 Source4:        figlet222-8859tables.tar.bz2
-Source5:        figlet-licpatch.sh
+Source100:      figlet-licpatch.sh
+# PATCH-FIX-OPENSUSE figlet-config.patch -- Fix installation directories
 Patch0:         figlet-config.patch
-Patch1:         figlet-random.patch
-Patch2:         figlet-implicit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 
 %description
 FIGlet can create characters in many different styles and can kern and
@@ -51,38 +50,51 @@
 generally reminiscent of the sort of "signatures" many people like to
 put at the end of e-mail and UseNet messages.
 
-
-
-Authors:
---------
-    Glenn Chappell <[email protected]>
-    Ian Chai <[email protected]>
-    Christiaan Keet <[email protected]>
-
 %prep
-%setup -n figlet222 -a 1 -a 2 -a 3 -a 4
+%setup -q -a 1 -a 2 -a 3 -a 4
+cd contributed
+tar zxf Obanner-canon.tgz
+rm Obanner-canon.tgz
+tar zxf Obanner.tgz
+rm Obanner.tgz
+cd ..
+cd international
+tar zxf cjkfonts.tar.gz
+rm cjkfonts.tar.gz
+cd ..
 %patch0
-%patch1
-%patch2
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="%{optflags}"
 
 %install
-make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=%{buildroot} install
-cp -a contributed %{buildroot}/usr/share/games/figlet/fonts
-cp -a international %{buildroot}/usr/share/games/figlet/fonts
-cp -a ours %{buildroot}/usr/share/games/figlet/fonts
-chmod 0755 %{buildroot}/usr/games/showfigfonts %{buildroot}/usr/games/figlist
+%make_install
+
+# For inclusion in documentation
+mv contributed/bdffonts/bdf2flf.pl .
+mv international/febrew .
+
+cp -a contributed %{buildroot}%{_datadir}/figlet/
+cp -a international %{buildroot}%{_datadir}/figlet/
+cp -a ours %{buildroot}%{_datadir}/figlet/
+
+%fdupes -s %{buildroot}
 
 %clean
-rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-/usr/games/*
-/usr/share/games/figlet
-%doc /usr/share/man/man6/*
-%doc LICENSE CHANGES README FAQ
+%defattr(-,root,root,-)
+%doc CHANGES FAQ LICENSE README figfont.txt
+%doc bdf2flf.pl febrew
+%{_bindir}/chkfont
+%{_bindir}/figlet
+%{_bindir}/figlist
+%{_bindir}/showfigfonts
+%{_datadir}/figlet/
+%doc %{_mandir}/man6/chkfont.6%{ext_man}
+%doc %{_mandir}/man6/figlet.6%{ext_man}
+%doc %{_mandir}/man6/figlist.6%{ext_man}
+%doc %{_mandir}/man6/showfigfonts.6%{ext_man}
 
 %changelog

++++++ figlet-config.patch ++++++
--- /var/tmp/diff_new_pack.P4P0eD/_old  2011-07-20 09:42:05.000000000 +0200
+++ /var/tmp/diff_new_pack.P4P0eD/_new  2011-07-20 09:42:05.000000000 +0200
@@ -1,71 +1,18 @@
---- Makefile
-+++ Makefile
-@@ -4,7 +4,7 @@
- # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan
- # Copyright 2002 Christiaan Keet
- 
--# Please make sure DESTDIR, MANDIR, DEFAULTFONTDIR and
-+# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and
- #   DEFAULTFONTFILE are defined to reflect the situation
- #   on your computer.  See README for details.
- 
-@@ -15,15 +15,15 @@
- CFLAGS = -g
+--- Makefile.orig      2011-01-26 12:36:21.000000000 +0200
++++ Makefile   2011-07-16 17:30:18.210000038 +0300
+@@ -29,13 +29,13 @@
+ XCFLAGS       = -DTLF_FONTS
+ 
+ # Where to install files
+-prefix        = /usr/local
++prefix        = /usr
  
  # Where the executables should be put
--DESTDIR = /usr/local/bin
-+BINDIR = /usr/games
+ BINDIR        = $(prefix)/bin
  
  # Where the man page should be put
--MANDIR = /usr/local/man/man6
-+MANDIR = /usr/share/man/man6
+-MANDIR        = $(prefix)/man
++MANDIR        = $(prefix)/share/man
  
  # Where figlet will search first for fonts (the ".flf" files).
--DEFAULTFONTDIR = /usr/local/share/figlet
-+DEFAULTFONTDIR = /usr/share/games/figlet/fonts
- # Use this definition if you can't put things in /usr/local/share/figlet
--DEFAULTFONTDIR = fonts
-+#DEFAULTFONTDIR = fonts
- 
- # The filename of the font to be used if no other is specified
- #   (standard.flf is recommended, but any other can be used).
-@@ -52,11 +52,11 @@
-       rm -f *.o figlet chkfont
- 
- install: figlet chkfont
--      mkdir -p $(DEFAULTFONTDIR)
--      cp figlet $(DESTDIR)
--      cp figlet.6 $(MANDIR)
--      cp chkfont $(DESTDIR)
--      cp figlist $(DESTDIR)
--      cp showfigfonts $(DESTDIR)
--      cp fonts/*.flf $(DEFAULTFONTDIR)
--      cp fonts/*.flc $(DEFAULTFONTDIR)
-+      mkdir -p $(DESTDIR)$(DEFAULTFONTDIR) $(DESTDIR)$(BINDIR) 
$(DESTDIR)$(MANDIR)
-+      cp figlet $(DESTDIR)$(BINDIR)
-+      cp figlet.6 $(DESTDIR)$(MANDIR)
-+      cp chkfont $(DESTDIR)$(BINDIR)
-+      cp figlist $(DESTDIR)$(BINDIR)
-+      cp showfigfonts $(DESTDIR)$(BINDIR)
-+      cp fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
-+      cp fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
---- README
-+++ README
-@@ -90,13 +90,14 @@
-         nroff -man figlet.6 | more
- 
- (2) Do a complete installation.  To do the this, set the variables
--DESTDIR and MANDIR in Makefile to the appropriate values.  DESTDIR
-+BINDIR and MANDIR in Makefile to the appropriate values.  BINDIR
- should be the full pathname of the directory in which the executable
- files should be put (we recommend "/usr/games");  MANDIR should be the
- full pathname of the directory in which the figlet man page should be
- put, generally "/usr/man/man6".  Once DEFAULTFONTDIR, DEFAULTFONTFILE,
--DESTDIR and MANDIR have been set, in the directory containing the FIGlet
--source, type "make install".
-+BINDIR and MANDIR have been set, in the directory containing the FIGlet
-+source, type "make install". You can relocate install objects into a
-+staging area by "make DESTDIR=/tmp/figlet_staging_area install".
- 
- If space is a problem, the only files you absolutely must have to run
- figlet are "figlet" (the executable) and at least one font (preferably
+ DEFAULTFONTDIR = $(prefix)/share/figlet

++++++ figlet-licpatch.sh ++++++
--- /var/tmp/diff_new_pack.P4P0eD/_old  2011-07-20 09:42:05.000000000 +0200
+++ /var/tmp/diff_new_pack.P4P0eD/_new  2011-07-20 09:42:05.000000000 +0200
@@ -1,20 +1,20 @@
 # removes stuff under old Unicode license
 # $1 is directory with tarballs
 set -o errexit
-if test -f "$1/figlet222.tar.bz2" ; then
+VERSION=2.2.4
+if test -f "$1/figlet-$VERSION.tar.gz" ; then
        TMPDIR=`mktemp -d`
        if test -d $TMPDIR ; then
-               trap "rm -rf  \"$TMPDIR\" \"$1/figlet222-patched.tar.bz2\"" ERR
+               trap "rm -rf \"$TMPDIR\" 
\"$1/figlet-$VERSION-patched.tar.bz2\"" ERR
                cd $TMPDIR
-               tar -xjf "$1/figlet222.tar.bz2"
-               rm -f figlet222/fonts/jis0201.flc figlet222/fonts/8859-*.flc
-               tar -cjf "$1/figlet222-patched.tar.bz2" figlet222
+               tar -xzf "$1/figlet-$VERSION.tar.gz"
+               rm -f figlet-$VERSION/fonts/jis0201.flc 
figlet-$VERSION/fonts/8859-*.flc
+               tar -cjf "$1/figlet-$VERSION-patched.tar.bz2" figlet-$VERSION
                cd - 1>/dev/null
                rm -Rf $TMPDIR
        else
                echo "creating tmp dir failed"
        fi
 else
-       echo "file: $1/figlet222.tar.bz2 doesn't exist"
+       echo "file: $1/figlet-$VERSION.tar.gz doesn't exist"
 fi
-


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to