X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=81da6eb926a519125310c851e56568b1318ef83c;hp=fcd4fd0ff12b43be1b8312f21c33563c0d4041ad;hb=51798621ae3f8a478d278cb402db6cfb0f5f2578;hpb=975879efc328cdef979e9478a3838abc30a7bad7

diff --git a/fox.spec b/fox.spec
index fcd4fd0..81da6eb 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,13 +1,14 @@
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.0.31
-Release:	1
+Version:	1.2.4
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
-#Source0ActiveFTP
-Source0:	ftp://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
+Source0:	http://www.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
+# Source0-md5:	43d7311bc9938b2729d8153d259c3896
 Patch0:		%{name}-opt.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.fox-toolkit.org/fox.html
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -42,7 +43,7 @@ rozszerzanie.
 Summary:	FOX example applications
 Summary(pl):	Przyk³ady aplikacji w FOX
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	%{name}-example-apps
 
 %description progs
@@ -52,22 +53,22 @@ Editor and file browser, written with FOX.
 Edytor i przegl±darka plików napisane z u¿yciem toolkitu FOX.
 
 %package devel
-Summary:	Header files and development documentation for the FOX library
-Summary(pl):	Pliki nag³ówkowe i dokumentacja do biblioteki FOX
+Summary:	Header files for FOX library
+Summary(pl):	Pliki nag³ówkowe biblioteki FOX
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Header files and development documentation for the FOX library.
+Header files for FOX library.
 
 %description devel -l pl
-Pliki nag³ówkowe i dokumentacja programisty do biblioteki FOX.
+Pliki nag³ówkowe biblioteki FOX.
 
 %package static
 Summary:	FOX static libraries
 Summary(pl):	Biblioteki statyczne FOX
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 FOX static libraries.
@@ -75,28 +76,41 @@ FOX static libraries.
 %description static -l pl
 Biblioteki statyczne FOX.
 
+%package doc
+Summary:	Development documentation for FOX library
+Summary(pl):	Dokumentacja programisty do biblioteki FOX
+Group:		X11/Development/Libraries
+
+%description doc
+Development documentation for FOX library.
+
+%description doc -l pl
+Dokumentacja programisty do biblioteki FOX.
+
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
+LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %configure \
-	--with-opengl=mesa \
+	--with-opengl \
 	%{?debug:--enable-debug}%{!?_debug:--enable-release}
-%{__make} GL_LIBS="-lGL -lGLU"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
+ln -sf libFOX-1.1.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
 rm -f doc/Makefile* doc/*/Makefile*
 
@@ -108,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS LICENSE_ADDENDUM README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files progs
@@ -116,16 +130,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/adie
 %attr(755,root,root) %{_bindir}/calculator
 %attr(755,root,root) %{_bindir}/PathFinder
+%attr(755,root,root) %{_bindir}/shutterbug
 
 %files devel
 %defattr(644,root,root,755)
-%doc ADDITIONS TRACING doc
+%doc ADDITIONS TRACING
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_mandir}/man1/*
-%{_includedir}/fox
+%{_includedir}/fox-1.2
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*