SPECS: nurbs++.spec - dropped templates patch, added gcc4 patch to...

[qboosh]

Author: qboosh                       Date: Sat Apr 15 18:22:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped templates patch, added gcc4 patch to build with gcc 4 (possibly >= 3.4)
- updated link patch to kill unnecessary linking with some X libs

---- Files affected:
SPECS:
   nurbs++.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/nurbs++.spec
diff -u SPECS/nurbs++.spec:1.35 SPECS/nurbs++.spec:1.36
--- SPECS/nurbs++.spec:1.35	Sun Apr  9 12:15:11 2006
+++ SPECS/nurbs++.spec	Sat Apr 15 20:22:20 2006
@@ -12,24 +12,23 @@
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/libnurbs/%{name}-%{version}.tar.bz2
 # Source0-md5:	11aa7f2a1ae2bc3e2671d56f557fbbbf
-Patch0:		%{name}-templates.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-magick.patch
-Patch3:		%{name}-config.patch
-Patch4:		%{name}-gcc33.patch
-Patch5:		%{name}-strict_types.patch
+Patch0:		%{name}-link.patch
+Patch1:		%{name}-magick.patch
+Patch2:		%{name}-config.patch
+Patch3:		%{name}-gcc33.patch
+Patch4:		%{name}-strict_types.patch
+Patch5:		%{name}-gcc4.patch
 URL:		http://libnurbs.sourceforge.net/
 BuildRequires:	ImageMagick-devel >= 1:6.2.4.0
-BuildRequires:	OpenGL-devel
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	autoconf
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 %if %{with cppunit}
 BuildRequires:	cppunit-devel
 %endif
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 5:3.4
 BuildRequires:	libtool >= 2:1.4d-3
-Requires:	OpenGL
+BuildRequires:	xorg-lib-libX11-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define 	_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -53,8 +52,8 @@
 Summary(pl):	Pliki nagłówkowe biblioteki NURBS++
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	ImageMagick-devel >= 5.2.9
-Requires:	libstdc++-devel
+Requires:	ImageMagick-devel >= 1:6.2.4.0
+Requires:	libstdc++-devel >= 5:3.4
 
 %description devel
 NURBS++ library header files.
@@ -92,16 +91,16 @@
 export has_cppunit=no
 %endif
 %configure \
-	--enable-shared \
-	--enable-static \
+	--disable-debug \
+	--enable-double \
 	--enable-exception \
-	--enable-library \
-	--with-x \
 	--enable-float \
-	--enable-double \
-	--with-opengl \
+	--enable-library \
+	--enable-shared \
+	--enable-static \
 	--with-magick \
-	--disable-debug
+	--with-opengl \
+	--with-x
 
 %{__make}
 
@@ -139,6 +138,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/04/15 18:22:20  qboosh
+- dropped templates patch, added gcc4 patch to build with gcc 4 (possibly >= 3.4)
+- updated link patch to kill unnecessary linking with some X libs
+
 Revision 1.35  2006/04/09 10:15:11  cieciwa
 - s/XFree86-devel/xorg-lib-libX11-devel/
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nurbs++.spec?r1=1.35&r2=1.36&f=u