Renamed spec file.

diff --git a/Makefile.am b/Makefile.am
index fe2df41..76f7845 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,16 @@
-## $Id: Makefile.am,v 1.10 2002-11-15 23:00:59 adam Exp $
+## $Id: Makefile.am,v 1.11 2003-02-20 21:06:47 adam Exp $
 
 AUTOMAKE_OPTIONS=foreign
 
-EXTRA_DIST= README CHANGELOG 
-
 SUBDIRS=util bfile dfa dict isams isamb isamc isam rset data1 \
  recctrl tab index test examples include doc
 
 SPEC_FILE=$(PACKAGE).spec
 
+EXTRA_DIST= README CHANGELOG $(SPEC_FILE) idzebra.spec.in
+
 dist-hook:
-       cd doc; make
        cp $(srcdir)/LICENSE* $(distdir)
-       cp $(srcdir)/*.spec $(distdir)
        mkdir $(distdir)/win
        for i in $(srcdir)/win/*; do \
                if test -f $$i; then \

diff --git a/configure.in b/configure.in
index 1acf321..7c299af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2002
-dnl $Id: configure.in,v 1.63 2003-02-06 16:58:56 heikki Exp $
+dnl $Id: configure.in,v 1.64 2003-02-20 21:06:47 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(idzebra,1.3.4)
@@ -370,6 +370,7 @@ AC_OUTPUT([
   perl/Makefile.PL test/xelm/Makefile
   test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
+  idzebra.spec
 ])
 
 if test -x "$perlbin"; then

diff --git a/idzebra.spec.in b/idzebra.spec.in
new file mode 100644 (file)
index 0000000..3caaf4b
--- /dev/null
+++ b/idzebra.spec.in
@@ -0,0 +1,43 @@
+Name: idzebra
+Version: @VERSION@
+Release: 1
+Requires: yaz expat bzip2-libs tcl
+Copyright: GPL
+Group: Applications/Databases
+Vendor: Index Data ApS <info@indexdata.dk>
+Source: idzebra-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Packager: Adam Dickmeiss <adam@indexdata.dk>
+URL: http://www.indexdata.dk/zebra/
+BuildRequires: yaz expat-devel bzip2-devel tcl
+Summary: High-performance, structured text indexing and retrival engine.
+
+%description
+Zebra is a high-performance, general-purpose structured text indexing
+and retrieval engine. It reads structured records in a variety of input
+formats (eg. email, XML, MARC) and allows access to them through exact
+boolean search expressions and relevance-ranked free-text queries. 
+
+%prep
+%setup
+
+%build
+
+CFLAGS="$RPM_OPT_FLAGS" \
+ ./configure --prefix=/usr --with-yazconfig=/usr/bin
+make CFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -fr ${RPM_BUILD_ROOT}
+make prefix=${RPM_BUILD_ROOT}/usr mandir=${RPM_BUILD_ROOT}/usr/share/man install
+
+%clean
+rm -fr ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-,root,root)
+%doc README LICENSE.zebra CHANGELOG 
+%config /usr/share/idzebra/tab
+/usr/bin/*
+/usr/share/doc/idzebra
+/usr/share/man/*/*

diff --git a/zebra.spec b/zebra.spec
deleted file mode 100644 (file)
index 5672f26..0000000
--- a/zebra.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-Name: idzebra
-Version: 1.3.4
-Release: 1
-Requires: yaz expat bzip2-libs tcl
-Copyright: GPL
-Group: Applications/Databases
-Vendor: Index Data ApS <info@indexdata.dk>
-Source: idzebra-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-%{version}-root
-Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.dk/zebra/
-BuildRequires: yaz expat-devel bzip2-devel tcl
-Summary: High-performance, structured text indexing and retrival engine.
-
-%description
-Zebra is a high-performance, general-purpose structured text indexing
-and retrieval engine. It reads structured records in a variety of input
-formats (eg. email, XML, MARC) and allows access to them through exact
-boolean search expressions and relevance-ranked free-text queries. 
-
-%prep
-%setup
-
-%build
-
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=/usr --with-yazconfig=/usr/bin
-make CFLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/usr mandir=${RPM_BUILD_ROOT}/usr/share/man install
-
-%clean
-rm -fr ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root)
-%doc README LICENSE.zebra CHANGELOG 
-%config /usr/share/idzebra/tab
-/usr/bin/*
-/usr/share/doc/idzebra
-/usr/share/man/*/*