added rpm support

diff --git a/ChangeLog b/ChangeLog
index bcdf9f593f48fc67648df58b529918d9b8d300e5..ce2b05a8922c0662381e4f1798c619b1e545b9d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2002-xx-xx
+ - added a spec file for rpm support
+
 2002-03-11
  - readline support
  - abook can be compiled with g++

diff --git a/Makefile.am b/Makefile.am
index afd3141473992b6b28d3d880fff31272282ed34c..e2273be173703b9764873c284ab0529eed3f6dc8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ abook_SOURCES = abook.c database.c filter.c list.c misc.c conff.c \
                options.h edit.h ldif.h abook_curses.h ui.h getname.h \
                getopt.h abook_rl.h
 
-EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc
+EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc abook.spec
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
@@ -18,3 +18,4 @@ install-data-local:
 uninstall-local:
        -rm -f $(DESTDIR)$(mandir)/man1/abook.1
        -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
+

diff --git a/Makefile.in b/Makefile.in
index 353f98352372e7111a3b48c4839c0128cc4fbd75..bbfc365b9360ff3deada3973d9c431a7734653ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,11 +76,11 @@ abook_SOURCES = abook.c database.c filter.c list.c misc.c conff.c \
                getopt.h abook_rl.h
 
 
-EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc
+EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc abook.spec
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  abook.spec
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -98,9 +98,9 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \
-aclocal.m4 config.guess config.h.in config.sub configure configure.in \
-install-sh missing mkinstalldirs
+Makefile.am Makefile.in NEWS THANKS TODO abook.spec.in acconfig.h \
+acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \
+configure.in install-sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,6 +159,8 @@ distclean-hdr:
        -rm -f config.h
 
 maintainer-clean-hdr:
+abook.spec: $(top_builddir)/config.status abook.spec.in
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-binPROGRAMS:
 

diff --git a/abook.spec.in b/abook.spec.in
new file mode 100644 (file)
index 0000000..2d0b407
--- /dev/null
+++ b/abook.spec.in
@@ -0,0 +1,48 @@
+Summary: Text-based addressbook program
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
+Source: http://prdownloads.sourceforge.net/abook/abook-%{version}.tar.gz
+URL: http://abook.sourceforge.net/
+License: GPL
+Group: Utilities
+BuildRoot: /var/tmp/%{name}-%{version}-buildroot
+
+%description
+Abook is a text-based addressbook program designed to
+use with mutt mail client.
+
+%prep
+%setup -q
+
+%build
+./configure --prefix="$RPM_BUILD_ROOT/usr"
+make CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
+
+%install
+make install-strip
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO sample.abookrc
+/usr/bin/abook
+/usr/man/man1/abook.1*
+/usr/man/man5/abookrc.5*
+
+%changelog
+* Mon Mar 11 2002 Jaakko Heinonen <jheinonen@users.sourceforge.net>
+- Added missing files: abookrc.5, FAQ
+- Made build use RPM_OPT_FLAGS
+- Changed BuildRoot
+
+* Tue Jun 19 2001 Don Harper <duck@duckland.org>
+- Updated to version 0.4.13.
+
+* Sun Dec 31 2000 Gustavo Niemeyer <niemeyer@conectiva.com>
+- Updated to version 0.4.11.
+
+* Wed Sep 20 2000 Gustavo Niemeyer <niemeyer@conectiva.com>
+- First package.

diff --git a/configure b/configure
index 72566125f418e2f658c97abd089bc40d21c6c736..e6b6eb04a31f45659bac77fd8bec0d8d8f027b45 100755 (executable)
--- a/configure
+++ b/configure
@@ -695,7 +695,7 @@ fi
 
 PACKAGE=abook
 
-VERSION=2002-03-11
+VERSION=0.4.99.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -2762,7 +2762,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile abook.spec config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2855,7 +2855,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile abook.spec"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index b09f46baf07e00cd6a429338d4a1814da63aa2c3..c562bb00b1bef1c4b34bb48451d33579c480dade 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 2002-03-11)
+AM_INIT_AUTOMAKE(abook, 0.4.99.0)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -72,5 +72,5 @@ if test x$GCC = xyes; then
        CFLAGS="-Wall $CFLAGS"
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile abook.spec)