contrib/recode.spec2 (bis)

diff --git a/Makefile.am b/Makefile.am
index 6a7607f5adf10ffc8e08e29bca090c57ba26799c..df9230d3ef70dbfa636f3b58fbe0eb187c3b77a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = gnits
 ACLOCAL = ./aclocal.sh @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = COPYING-LIB recode.spec aclocal.sh m4/ChangeLog
+EXTRA_DIST = COPYING-LIB aclocal.sh m4/ChangeLog
 SUBDIRS = doc lib libiconv po src tests contrib python
 
 # The following goals for the maintainer of the Recode Web site.

diff --git a/Makefile.in b/Makefile.in
index c0563ac6b86967e29ea59806f1833878f6e32377..fa37b7584ec2d1e4f85503bc4629375b8961a9d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -226,7 +226,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnits
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = COPYING-LIB recode.spec aclocal.sh m4/ChangeLog
+EXTRA_DIST = COPYING-LIB aclocal.sh m4/ChangeLog
 SUBDIRS = doc lib libiconv po src tests contrib python
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b8108751f5912c4bb7f9c6f3af500b0dd55ccad0..7c772cc5ed2f8a9efff510e0363f6dc188da0fed 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  François Pinard  <pinard@iro.umontreal.ca>
+
+       * recode.spec2: New file.
+       * recode.spec1: New name for recode.spec.
+       Reported by Bennett Todd.
+
 2008-02-21  François Pinard  <pinard@iro.umontreal.ca>
 
        * README: Converted to reST.

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 7f2d3a777591d6fb51704119d0a8e4e3e1add174..7a1b8f47d7f372003851623f198163be5976bb65 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -22,4 +22,5 @@ AMIGA_PORT = lib-Makefile.Amiga src-Makefile.Amiga
 DJGPP_PORT = djgpp-README djgpp-diffs
 ELISP_FILES = recode.el utf8.el
 
-EXTRA_DIST = $(AMIGA_PORT) $(DJGPP_PORT) $(ELISP_FILES) recode.spec
+EXTRA_DIST = $(AMIGA_PORT) $(DJGPP_PORT) $(ELISP_FILES) \
+recode.spec1 recode.spec2

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 3a8aeb54e2cb8bb47ac5ffb1195ae6cbd7d18c62..ff6c07309693e22ee43e70aa559257698866412f 100644 (file)
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -200,7 +200,9 @@ AUTOMAKE_OPTIONS = gnits
 AMIGA_PORT = lib-Makefile.Amiga src-Makefile.Amiga
 DJGPP_PORT = djgpp-README djgpp-diffs
 ELISP_FILES = recode.el utf8.el
-EXTRA_DIST = $(AMIGA_PORT) $(DJGPP_PORT) $(ELISP_FILES) recode.spec
+EXTRA_DIST = $(AMIGA_PORT) $(DJGPP_PORT) $(ELISP_FILES) \
+recode.spec1 recode.spec2
+
 all: all-am
 
 .SUFFIXES:

diff --git a/recode.spec b/recode.spec
deleted file mode 100644 (file)
index 9948da2..0000000
--- a/recode.spec
+++ /dev/null
@@ -1,46 +0,0 @@
-# RPM spec file for Free recode.
-# Copyright (C) 2000 Progiciels Bourbeau-Pinard inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 2000.
-
-Name:    recode
-Version: 3.5d
-Release: 1
-Summary: Converter between charsets and surfaces
-Group:   Utilities/Text
-
-Vendor:    Progiciels Bourbeau-Pinard inc.
-Copyright: GPL, LGPL
-Packager:  Franc,ois Pinard <pinard@iro.umontreal.ca>
-
-Source: http://www.iro.umontreal.ca/contrib/recode/recode-3.5d.tar.gz
-URL:    http://www.iro.umontreal.ca/contrib/recode/HTML
-
-Buildroot: /bpi/titan/home/pinard/.rpm
-
-%description
-The recode library converts files between character sets and usages.
-It recognises or produces more than 300 different character sets
-and transliterates files between almost any pair.  When exact
-transliteration are not possible, it gets rid of offending characters
-or fall back on approximations.  The recode program is a handy
-front-end to the library.
-
-%prep
-%setup
-%patch
-
-%build
-
-%install
-
-%files
-%doc /usr/doc/packages/recode/README
-%doc /usr/doc
-/usr/bin/recode
-/usr/include/recode.h
-/usr/include/recodext.h
-/usr/info/recode.info*.gz
-/usr/lib/librecode.a
-/usr/lib/librecode.la
-/usr/man/man1/recode.1.gz
-/usr/share/locale/*/LC_MESSAGES/recode.mo