- updated to 1.4.5

Changed files:
    fox-Makefile.patch -> 1.1
    fox-link.patch -> 1.3
    fox.spec -> 1.76

diff --git a/fox-Makefile.patch b/fox-Makefile.patch
new file mode 100644 (file)
index 0000000..c54b8f6
--- /dev/null
+++ b/fox-Makefile.patch
@@ -0,0 +1,24 @@
+diff -Nru fox-1.4.5.orig/Makefile.am fox-1.4.5/Makefile.am
+--- fox-1.4.5.orig/Makefile.am 2005-02-16 13:32:39.178606728 +0000
++++ fox-1.4.5/Makefile.am      2005-02-16 13:32:53.081493168 +0000
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
+ 
+-SUBDIRS    = utils include src chart doc tests shutterbug adie pathfinder calculator windows
++SUBDIRS    = utils include src chart tests shutterbug adie pathfinder calculator windows
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.lsm index.html aclocal.m4
+ 
+ bin_SCRIPTS = fox-config
+diff -Nru fox-1.4.5.orig/Makefile.in fox-1.4.5/Makefile.in
+--- fox-1.4.5.orig/Makefile.in 2005-02-16 13:32:39.178606728 +0000
++++ fox-1.4.5/Makefile.in      2005-02-16 13:32:49.459043864 +0000
+@@ -102,7 +102,7 @@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
+ 
+-SUBDIRS = utils include src chart doc tests shutterbug adie pathfinder calculator windows
++SUBDIRS = utils include src chart tests shutterbug adie pathfinder calculator windows
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.lsm index.html aclocal.m4
+ 
+ bin_SCRIPTS = fox-config

diff --git a/fox-link.patch b/fox-link.patch
index d0f6c507f3531241fa2811297c7d0275e1076ea6..1be716a1b4c23f4543d738c2ec25f24fa4bdf894 100644 (file)
--- a/fox-link.patch
+++ b/fox-link.patch
@@ -2,10 +2,10 @@
 +++ fox-1.2.4.new/chart/Makefile.am    2004-06-16 17:57:39.030439224 +0000
 @@ -8,7 +8,7 @@
  
- lib_LTLIBRARIES = libCHART-1.2.la
+ lib_LTLIBRARIES = libCHART-1.4.la
  
--libCHART_1_2_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS)
-+libCHART_1_2_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) ../src/libFOX-1.2.la
+-libCHART_1_4_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS)
++libCHART_1_4_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) ../src/libFOX-1.4.la
  
- libCHART_1_2_la_LDFLAGS = \
+ libCHART_1_4_la_LDFLAGS = \
          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \

diff --git a/fox.spec b/fox.spec
index a9f4a0a9d1e0be550ae90356207531f4da5f2c4f..b9a8d0e8af62171cfeeba5f3f65ca33fa73911ce 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -1,14 +1,15 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl):   FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.2.13
+Version:       1.4.5
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 497a6c5880501e502d87a2e4a7c36d29
+# Source0-md5: 8d5355820bd76ccd4dafe37212f82d55
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
+Patch2:                %{name}-Makefile.patch
 URL:           http://www.fox-toolkit.org/fox.html
 BuildRequires: OpenGL-devel
 BuildRequires: autoconf
@@ -100,6 +101,7 @@ Dokumentacja programisty do biblioteki FOX.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -119,7 +121,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf libFOX-1.2.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
+ln -sf libFOX-1.4.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
 rm -f doc/Makefile* doc/*/Makefile*
 
@@ -140,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/calculator
 %attr(755,root,root) %{_bindir}/PathFinder
 %attr(755,root,root) %{_bindir}/shutterbug
+%attr(755,root,root) %{_bindir}/Adie.stx
 
 %files devel
 %defattr(644,root,root,755)
@@ -149,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_mandir}/man1/*
-%{_includedir}/fox-1.2
+%{_includedir}/fox-1.4
 
 %files static
 %defattr(644,root,root,755)