Remove idzebra.spec.in

diff --git a/.gitignore b/.gitignore
index ad4677f..20d9ed6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ config.status
 configure
 libtool
 idzebra-config-2.0
-idzebra.spec
 autom4te.cache
 Doxyfile
 dox

diff --git a/Makefile.am b/Makefile.am
index 27ce608..b492b0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ aclocal_DATA = m4/idzebra-2.0.m4
 
 SPEC_FILE=idzebra.spec
 
-EXTRA_DIST= README NEWS IDMETA $(SPEC_FILE) $(SPEC_FILE).in \
+EXTRA_DIST= README NEWS IDMETA $(SPEC_FILE) \
  idzebra-config-2.0.in m4/idzebra-2.0.m4 m4/yaz.m4 buildconf.sh Doxyfile.in
 
 dist-hook:

diff --git a/configure.ac b/configure.ac
index ccbd3c3..f070491 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,7 +350,6 @@ AC_OUTPUT([
   examples/marcxml/Makefile 
   examples/oai-pmh/Makefile
   examples/zthes/Makefile
-  idzebra.spec
   idzebra-config-2.0
   Doxyfile
   win/version.nsi

diff --git a/idzebra.spec b/idzebra.spec
new file mode 100644 (file)
index 0000000..63e9cb4
--- /dev/null
+++ b/idzebra.spec
@@ -0,0 +1,89 @@
+Name: idzebra-2.0
+Version: 2.0.45
+Release: 1
+Requires: lib%{name}-modules = %{version}
+License: GPL
+Group: Applications/Databases
+Vendor: Index Data ApS <info@indexdata.dk>
+Source: idzebra-%{version}.tar.gz
+BuildRoot: %{_tmppath}/idzebra-%{version}-root
+Packager: Adam Dickmeiss <adam@indexdata.dk>
+URL: http://www.indexdata.dk/zebra/
+BuildRequires: libyaz4-devel expat-devel bzip2-devel tcl zlib-devel
+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. 
+
+%package -n lib%{name}
+Summary: Zebra libraries
+Group: Libraries
+Requires: libyaz4 bzip2-libs
+%description -n lib%{name}
+Libraries for the Zebra search engine.
+%post -p /sbin/ldconfig 
+%postun -p /sbin/ldconfig 
+
+%package -n lib%{name}-modules
+Summary: Zebra modules
+Group: Libraries
+Requires: lib%{name} = %{version} expat tcl
+%description -n lib%{name}-modules
+Modules for the Zebra search engine.
+
+%package -n lib%{name}-devel
+Summary: Zebra development libraries
+Group: Development/Libraries
+Requires: lib%{name} = %{version} libyaz4-devel bzip2-devel 
+%description -n lib%{name}-devel
+Development libraries for the Zebra search engine.
+
+%prep
+%setup -n idzebra-%{version}
+
+%build
+
+CFLAGS="$RPM_OPT_FLAGS" \
+ ./configure --prefix=/usr --enable-shared --with-yaz=/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
+rm ${RPM_BUILD_ROOT}/usr/lib/*.la
+rm ${RPM_BUILD_ROOT}/usr/bin/zebraidx
+rm ${RPM_BUILD_ROOT}/usr/share/man/man1/zebraidx.*
+rm ${RPM_BUILD_ROOT}/usr/bin/zebrasrv
+rm ${RPM_BUILD_ROOT}/usr/share/man/man8/zebrasrv.*
+rm ${RPM_BUILD_ROOT}/usr/share/man/man1/idzebra-config.*
+
+%clean
+rm -fr ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-,root,root)
+%doc README LICENSE.zebra NEWS
+%config /usr/share/idzebra-2.0/tab
+/usr/bin/zebrasrv-*
+/usr/bin/zebraidx-*
+/usr/share/doc/idzebra-2.0
+/usr/share/man/*/zebraidx-*
+/usr/share/man/*/zebrasrv-*
+/usr/share/idzebra-2.0-examples
+%files -n lib%{name}
+/usr/lib/*.so.*
+
+%files -n lib%{name}-modules
+/usr/lib/idzebra-2.0/modules/*
+
+%files -n lib%{name}-devel
+/usr/bin/idzebra-config-*
+/usr/include/idzebra-2.0/*
+/usr/lib/*.so
+/usr/lib/*.a
+/usr/share/man/*/idzebra-config-*
+/usr/share/aclocal/*.m4
+

diff --git a/idzebra.spec.in b/idzebra.spec.in
deleted file mode 100644 (file)
index d4420c4..0000000
--- a/idzebra.spec.in
+++ /dev/null
@@ -1,89 +0,0 @@
-Name: idzebra-2.0
-Version: @VERSION@
-Release: 1
-Requires: lib%{name}-modules = %{version}
-License: GPL
-Group: Applications/Databases
-Vendor: Index Data ApS <info@indexdata.dk>
-Source: idzebra-%{version}.tar.gz
-BuildRoot: %{_tmppath}/idzebra-%{version}-root
-Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.dk/zebra/
-BuildRequires: libyaz4-devel expat-devel bzip2-devel tcl zlib-devel
-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. 
-
-%package -n lib%{name}
-Summary: Zebra libraries
-Group: Libraries
-Requires: libyaz4 bzip2-libs
-%description -n lib%{name}
-Libraries for the Zebra search engine.
-%post -p /sbin/ldconfig 
-%postun -p /sbin/ldconfig 
-
-%package -n lib%{name}-modules
-Summary: Zebra modules
-Group: Libraries
-Requires: lib%{name} = %{version} expat tcl
-%description -n lib%{name}-modules
-Modules for the Zebra search engine.
-
-%package -n lib%{name}-devel
-Summary: Zebra development libraries
-Group: Development/Libraries
-Requires: lib%{name} = %{version} libyaz4-devel bzip2-devel 
-%description -n lib%{name}-devel
-Development libraries for the Zebra search engine.
-
-%prep
-%setup -n idzebra-%{version}
-
-%build
-
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=/usr --enable-shared --with-yaz=/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
-rm ${RPM_BUILD_ROOT}/usr/lib/*.la
-rm ${RPM_BUILD_ROOT}/usr/bin/zebraidx
-rm ${RPM_BUILD_ROOT}/usr/share/man/man1/zebraidx.*
-rm ${RPM_BUILD_ROOT}/usr/bin/zebrasrv
-rm ${RPM_BUILD_ROOT}/usr/share/man/man8/zebrasrv.*
-rm ${RPM_BUILD_ROOT}/usr/share/man/man1/idzebra-config.*
-
-%clean
-rm -fr ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root)
-%doc README LICENSE.zebra NEWS
-%config /usr/share/idzebra-2.0/tab
-/usr/bin/zebrasrv-*
-/usr/bin/zebraidx-*
-/usr/share/doc/idzebra-2.0
-/usr/share/man/*/zebraidx-*
-/usr/share/man/*/zebrasrv-*
-/usr/share/idzebra-2.0-examples
-%files -n lib%{name}
-/usr/lib/*.so.*
-
-%files -n lib%{name}-modules
-/usr/lib/idzebra-2.0/modules/*
-
-%files -n lib%{name}-devel
-/usr/bin/idzebra-config-*
-/usr/include/idzebra-2.0/*
-/usr/lib/*.so
-/usr/lib/*.a
-/usr/share/man/*/idzebra-config-*
-/usr/share/aclocal/*.m4
-