updated spec file which is now also included in the tarball

diff --git a/GiNaC.spec.in b/GiNaC.spec.in
index b06313cb83c02217943545b32bb180a2fa5e275f..8714be8fcb9f19a700e30bf1208b53894eb4c443 100644 (file)
--- a/GiNaC.spec.in
+++ b/GiNaC.spec.in
@@ -9,12 +9,11 @@ Release: %{release}
 Copyright: GPL
 Group: System Environment/Libraries
 Source: ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/%{name}-%{version}.tar.gz
-BuildRoot: /tmp/%{name}-buildroot
-Packager: Christian Bauer <Christian.Bauer@uni-mainz.de>
 URL: http://www.ginac.de/
 Prereq: /sbin/install-info
+#Requires: cln
+BuildRoot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
-Docdir: %{prefix}/doc
 
 %description
 GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an
@@ -38,25 +37,30 @@ develop GiNaC applications.
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
+./configure --prefix=%{_prefix}
+if [ -x /usr/bin/getconf ] ; then
+  NCPU=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+  if [ $NCPU -eq 0 ] ; then
+    NCPU=1
+  fi
+else  
+  NCPU=1
 fi
+PARL=$[ $NCPU + 1 ]
+(make -k -j $PARL; exit 0)
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/%{prefix} install-strip
+rm -rf ${RPM_BUILD_ROOT}
+mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
+make prefix=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} install
+gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/ginac.info*
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 %post
 /sbin/ldconfig
@@ -65,38 +69,39 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{prefix}/info/ginac.info %{prefix}/info/dir
+/sbin/install-info %{_infodir}/ginac.info.gz %{_infodir}/dir
 
 %preun devel
-/sbin/install-info --delete %{prefix}/info/ginac.info %{prefix}/info/dir
+if [ "$1" = 0 ]; then
+  /sbin/install-info --del %{_infodir}/ginac.info.gz %{_infodir}/dir
+fi
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/lib/*.so.*
-%{prefix}/man/man1/ginsh.1
-%{prefix}/man/man1/viewgar.1
-%{prefix}/bin/ginsh
-%{prefix}/bin/viewgar
+%{_libdir}/*.so.*
+%{_bindir}/ginsh
+%{_bindir}/viewgar
+%{_mandir}/man1/ginsh.1
+%{_mandir}/man1/viewgar.1
 
 %files devel
-%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/lib/*.a
-%{prefix}/lib/*.la
-%{prefix}/lib/*.so
-%{prefix}/include/*
-%{prefix}/info/*info*
-%{prefix}/man/man1/*-config.1
-%{prefix}/bin/*-config
-%{prefix}/share/doc/%{name}/*
-%{prefix}/share/aclocal/*
+%defattr(-,root,root)
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_includedir}/*
+%{_infodir}/*.info*
+%{_mandir}/man1/ginac-config.1
+%{_bindir}/ginac-config
+%{_datadir}/aclocal/*
 
 %changelog
-* Wed Jan 26 2000 Christian Bauer <Christian.Bauer@uni-mainz.de>
+* Thu Oct  5 2000 Christian Bauer <Christian.Bauer@uni-mainz.de>
+- cleaned up a bit
 
+* Wed Jan 26 2000 Christian Bauer <Christian.Bauer@uni-mainz.de>
 - split into user and devel packages
 
 * Wed Dec  1 1999 Christian Bauer <Christian.Bauer@uni-mainz.de>
-
 - aclocal macros get installed

diff --git a/Makefile.am b/Makefile.am
index 192308cef7b1b17b50c987b59fcbedce778709a8..fec6552ee80e15c3628f88ae8dbfe6a80f5ec99a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,16 +9,15 @@ AUTOMAKE_OPTIONS = 1.4
 bin_SCRIPTS = ginac-config
 
 # All the rest of the distributed files
-EXTRA_DIST = autogen.sh ginac.m4
+EXTRA_DIST = ginac.m4 GiNaC.spec
 
 # M4 macro file for inclusion with autoconf
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ginac.m4
 
 # Rule to build tar-bzipped distribution package
-$(PACKAGE)-$(VERSION).tar.bz2: dist
+$(PACKAGE)-$(VERSION).tar.gz: dist
 
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
-       cp $(PACKAGE)-$(VERSRION).tar.gz /usr/src/redhat/SOURCES
-       rpm -ba GiNaC.spec
+       rpm --tarball a $(PACKAGE)-$(VERSION).tar.gz