From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 28 Jan 2003 22:00:03 +0000 (+0000)
Subject: - updated to 1.0.30
X-Git-Tag: STABLE~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=commitdiff_plain;h=c9aea0785857192459ad11d1a622f738a423e700;hp=4b7aa7bf833eaa55776d37391588ba0390a6053f

- updated to 1.0.30
- added opt patch to avoid overriding optflags
- removed -frtti - it's enabled by default

Changed files:
    fox-opt.patch -> 1.1
    fox.spec -> 1.45
---

diff --git a/fox-opt.patch b/fox-opt.patch
new file mode 100644
index 0000000..97eae94
--- /dev/null
+++ b/fox-opt.patch
@@ -0,0 +1,30 @@
+--- fox-1.0.30/configure.in.orig	Sat Jan 11 06:01:11 2003
++++ fox-1.0.30/configure.in	Tue Jan 28 19:29:29 2003
+@@ -49,9 +49,6 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-dnl Prevents setting flags.
+-CXXFLAGS=""
+-
+ dnl Checks for programs.
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+@@ -240,7 +237,7 @@
+ AC_ARG_ENABLE(debug,[  --enable-debug          compile for debugging])
+ AC_MSG_RESULT([$enable_debug])
+ if test "x$enable_debug" = "xyes" ; then
+-CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
++CXXFLAGS="${CXXFLAGS} -DDEBUG"
+ fi
+ 
+ dnl Building for release
+@@ -248,7 +245,7 @@
+ AC_ARG_ENABLE(release,[  --enable-release        compile for release])
+ AC_MSG_RESULT([$enable_release])
+ if test "x$enable_release" = "xyes" ; then
+-CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++CXXFLAGS="${CXXFLAGS} -DNDEBUG"
+ if test "${GXX}" = "yes" ; then
+ CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+ fi
diff --git a/fox.spec b/fox.spec
index 041a2ff..0393d7a 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,17 +1,22 @@
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.0.28
+Version:	1.0.30
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
+#Source0ActiveFTP
 Source0:	ftp://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
-URL:		http://www.cfdrc.com/FOX/fox.html
+Patch0:		%{name}-opt.patch
+URL:		http://www.fox-toolkit.org/fox.html
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 Requires:	OpenGL
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,28 +77,29 @@ Biblioteki statyczne FOX.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 rm -f missing
-libtoolize -c -f
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="%{rpmcflags} -frtti" \
-#CFLAGS="%{rpmcflags} -frtti" \
 %configure \
 	--with-opengl=mesa \
-	--enable-release
+	%{?debug:--enable-debug}%{!?_debug:--enable-release}
 %{__make} GL_LIBS="-lGL -lGLU"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_datadir}
+install -d $RPM_BUILD_ROOT%{_datadir}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
 
+rm -f doc/Makefile* doc/*/Makefile*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -102,17 +108,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_bindir}/adie
-%attr(755,root,root) /%{_bindir}/calculator
-%attr(755,root,root) /%{_bindir}/PathFinder
+%attr(755,root,root) %{_bindir}/adie
+%attr(755,root,root) %{_bindir}/calculator
+%attr(755,root,root) %{_bindir}/PathFinder
 
 %files devel
 %defattr(644,root,root,755)
-%doc ADDITIONS AUTHORS README TRACING doc
+%doc ADDITIONS TRACING doc
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la