- up to 1.1.37, added link patch to link libCHART with libFOX

Changed files:
    fox-link.patch -> 1.1
    fox.spec -> 1.57

diff --git a/fox-link.patch b/fox-link.patch
new file mode 100644 (file)
index 0000000..00db14b
--- /dev/null
+++ b/fox-link.patch
@@ -0,0 +1,11 @@
+--- fox-1.1.37/chart/Makefile.am.orig  2003-09-20 04:34:59.000000000 +0200
++++ fox-1.1.37/chart/Makefile.am       2003-10-06 20:21:47.314645264 +0200
+@@ -8,7 +8,7 @@
+ 
+ lib_LTLIBRARIES = libCHART-1.1.la
+ 
+-libCHART_1_1_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS)
++libCHART_1_1_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) ../src/libFOX-1.1.la
+ 
+ libCHART_1_1_la_LDFLAGS = \
+         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \

diff --git a/fox.spec b/fox.spec
index 8cbef366f3c50b7dfd63bde7553d48d9184ba09d..99720779f9944a297b2591d99baab847a6b1871c 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -1,15 +1,16 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl):   FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.1.35
+Version:       1.1.37
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
 #Source0ActiveFTP
 Source0:       http://ftp.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: bc1535f9f8bbb481b7f14b985f75ff6b
+# Source0-md5: 6248cc760ae9b464cd519b4b6e909e07
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-amfix.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.fox-toolkit.org/fox.html
 BuildRequires: OpenGL-devel
 BuildRequires: autoconf
@@ -81,9 +82,9 @@ Biblioteki statyczne FOX.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-#rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -101,7 +102,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}
 # new fox installs headers in include/fox-1.1, but apps expect them as <fox/*.h>
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       foxincludedir=%{_includedir}/fox
+       foxincludedir=%{_includedir}/fox \
+       chartincludedir=%{_includedir}/fox/chart
 
 ln -sf libFOX-1.1.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so