cleaned up the spec file and associated changes in the Makefiles. Daniel

* Makefile.am libxslt.spec.in doc/Makefile.am: cleaned up
  the spec file and associated changes in the Makefiles.
Daniel

4 files changed, 38 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ca4fd4e..635abfd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 23 17:06:24 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* Makefile.am libxslt.spec.in doc/Makefile.am: cleaned up
+	  the spec file and associated changes in the Makefiles.
+
 Tue Oct 22 21:02:37 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* libxslt/pattern.c: Forgot to check a pointer, fixes bug #96495
diff --git a/Makefile.am b/Makefile.am
index 215cde22..2a16c61e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ cleantar:
 	@(rm -f libxslt*.tar.gz)
 
 rpm: cleantar
-	@(unset CDPATH ; $(MAKE) dist && rpm -ta $(distdir).tar.gz)
+	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
 
 
 pkgconfigdir=$(libdir)/pkgconfig
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 75780f06..8bde6e6e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,7 +13,7 @@ DOC_MAIN_SGML_FILE=libxslt.sgml
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=..
 
-HTML_DIR=@HTML_DIR@
+HTML_DIR=$(datadir)/doc
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html
 PAGES= API.html bugs.html contribs.html docs.html downloads.html \
@@ -36,15 +36,15 @@ $(APIPAGES): libxslt-refs.xml site.xsl api.xsl
 	  $(bindir)/xsltproc --html $(srcdir)/api.xsl $(srcdir)/xslt.html ; fi );
 
 scan:
-	gtkdoc-scan --module=libxslt --source-dir=$(DOC_SOURCE_DIR)/libxslt --ignore-headers="acconfig.h config.h win32config.h"
+	-gtkdoc-scan --module=libxslt --source-dir=$(DOC_SOURCE_DIR)/libxslt --ignore-headers="acconfig.h config.h win32config.h"
 #	gtkdoc-scan --module=libexslt --source-dir=$(DOC_SOURCE_DIR)/libexslt --ignore-headers="acconfig.h config.h win32config.h"
 
 templates: scan
-	gtkdoc-mktmpl --module=libxslt
+	-gtkdoc-mktmpl --module=libxslt
 #	gtkdoc-mktmpl --module=libexslt
 
 sgml:
-	gtkdoc-mkdb --module=libxslt --source-dir=$(DOC_SOURCE_DIR)/libxslt
+	-gtkdoc-mkdb --module=libxslt --source-dir=$(DOC_SOURCE_DIR)/libxslt
 #	gtkdoc-mkdb --module=libxslt --source-dir=$(DOC_SOURCE_DIR)/libexslt
 
 html:
diff --git a/libxslt.spec.in b/libxslt.spec.in
index 8745fc9a..2568ef74 100644
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -7,8 +7,8 @@ Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
-Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@
-BuildRequires: libxml2-devel >= @LIBXML_REQUIRED_VERSION@
+Requires: libxml2 >= 2.4.23
+BuildRequires: libxml2-devel >= 2.4.23
 BuildRequires: python python-devel
 BuildRequires: libxml2-python
 Prefix: %{_prefix}
@@ -24,7 +24,7 @@ installed. The xsltproc command is a command line interface to the XSLT engine
 Summary: Libraries, includes, etc. to embed the Gnome XSLT engine
 Group: Development/Libraries
 Requires: libxslt = %{version}
-Requires: libxml2-devel >= @LIBXML_REQUIRED_VERSION@
+Requires: libxml2-devel >= 2.4.23
 
 %description devel
 This C library allows to transform XML files into other XML files
@@ -36,7 +36,7 @@ installed.
 Summary: Python bindings for the libxslt library
 Group: Development/Libraries
 Requires: libxslt = %{version}
-Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@
+Requires: libxml2 >= 2.4.23
 Requires: python
 
 %description python
@@ -48,74 +48,53 @@ This library allows to parse sytlesheets, uses the libxml2-python
 to load and save XML and HTML files. Direct access to XPath and
 the XSLT transformation context are possible to extend the XSLT language
 with XPath functions written in Python.
+
 %prep
 %setup -q
 
 %build
-# Needed for snapshot releases.
-if [ ! -f configure ]; then
-%ifarch alpha
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} --libdir=%{_libdir}
-%else
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} --libdir=%{_libdir}
-%endif
-else
-%ifarch alpha
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} --libdir=%{_libdir}
-%else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} --libdir=%{_libdir}
-%endif
-fi
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
-fi
+%configure
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -d $RPM_BUILD_ROOT%{_mandir}/man4
 %makeinstall
-# make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} install
 
 #
 # this is a bit ugly but tries to generate the bindings for all versions
 # of python installed
+#
 for i in %{prefix}/include/python*
 do
     py_version=`echo $i | sed "s+%{prefix}/include/python++"`
     if test -x %{prefix}/bin/python$py_version
     then
         echo generating bindings for Python $py_version
-	(cd python ; make clean ; \
+      (cd python ; make clean ; \
          make PYTHON="%{prefix}/bin/python$py_version" \
-	      PYTHON_VERSION="$py_version"; \
-         make PYTHON="%{prefix}/bin/python$py_version" \
-	      PYTHON_VERSION="$py_version" \
-	      prefix=$RPM_BUILD_ROOT%{prefix} \
-	      mandir=$RPM_BUILD_ROOT%{_mandir} \
-	      libdir=$RPM_BUILD_ROOT%{_libdir} \
-	      install)
+            PYTHON_VERSION="$py_version"; \
+%makeinstall PYTHON="%{prefix}/bin/python$py_version" \
+            PYTHON_VERSION="$py_version" \
+            prefix=$RPM_BUILD_ROOT%{prefix})
     fi
 done
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README Copyright TODO FEATURES
-%doc doc/*.html doc/html doc/tutorial doc/*.gif doc/*.png
+%doc doc/*.html doc/html doc/tutorial doc/*.gif
 %doc %{_mandir}/man1/xsltproc.1*
-
 %{_libdir}/lib*.so.*
 %{prefix}/bin/xsltproc
 
@@ -123,26 +102,31 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README Copyright TODO FEATURES
+%doc %{_mandir}/man4/libxslt.4*
+%doc %{_mandir}/man4/libexslt.4*
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/*.sh
 %{prefix}/include/*
 %{prefix}/bin/xslt-config
 %{_libdir}/pkgconfig/libxslt.pc
+
 %files python
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README Copyright FEATURES
 %{_libdir}/python*/site-packages/libxslt.py
-%{_libdir}/python*/site-packages/libxsltmod.so
+%{_libdir}/python*/site-packages/libxsltmod*
 %doc python/TODO
 %doc python/libxsltclass.txt
 %doc python/tests/*.py
 %doc python/tests/*.xml
 %doc python/tests/*.xsl
 
-
 %changelog
+* Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com>
+- revamped the spec file, cleaned up some rpm building problems
+
 * Wed Sep  4 2002 Daniel Veillard <veillard@redhat.com>
 
 - library paths fixed for x86-64