rpms/factory/FC-3 factory.spec,1.6,1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/factory/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495/FC-3

Modified Files:
	factory.spec 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-3/factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- factory.spec	4 Dec 2004 09:54:42 -0000	1.6
+++ factory.spec	7 Sep 2005 14:14:05 -0000	1.7
@@ -1,19 +1,20 @@
 # $Id$
 
-Summary: A C++ class library for multivariate polynomial data	
-Name:    factory	
-Epoch:	 0
+Summary: C++ class library for multivariate polynomial data
+Name:    factory
 Version: 2.0.5
-Release: 3%{?dist_tag}
-License: GPL	
-Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
-Group:   System Environment/Libraries	
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Release: 6
+
+License: GPL
+URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+Group:   System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: factory-2.0.5-gcc34.patch
+Patch2: factory-64bit.patch
 
-BuildRequires:	gmp-devel
+BuildRequires: gmp-devel
 
 %description
 Factory is a C++ class library that implements a recursive representation
@@ -21,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -35,46 +34,48 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
 
 
 %build
 # Macaulay2's build instructions say to use --disable-streamio
-# *not* using --disable-streamio requires patching for gcc3 anyway.
+# *not* using --disable-streamio requires patching for gcc3+ anyway.
 %configure --disable-streamio
 
 # smp broken?
-make 
+make
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 # make install DESTDIR fails
 %makeinstall
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
-
+rm -rf $RPM_BUILD_ROOT
 
-# We're waiting on a shared-lib configuration
-%if 0
-%files
-%doc README NEWS ChangeLog
-%{_libdir}/lib*.so.*
-%endif
 
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%doc ChangeLog COPYING NEWS README NEWS
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 2.0.5-6
+- fix build on 64bit arches
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.5-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-3
-- (2nd try at) gcc34 patch 
+- (2nd try at) gcc34 patch
 
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.2
 - gcc34 patch