- updated to 1.7.36

- updated Makefile patch

diff --git a/fox-Makefile.patch b/fox-Makefile.patch
index a73882e0fe1bb9f4918d42cf6ff1cbeb5d953b49..73e0a429d407711ffb75bf786f5c3bf4553c0488 100644 (file)
--- a/fox-Makefile.patch
+++ b/fox-Makefile.patch
@@ -1,11 +1,11 @@
---- fox-1.7.26/Makefile.am.orig        2011-04-13 02:13:55.000000000 +0200
-+++ fox-1.7.26/Makefile.am     2011-05-28 07:42:42.173788784 +0200
+--- fox-1.7.36/Makefile.am.orig        2012-09-15 20:10:42.017935359 +0200
++++ fox-1.7.36/Makefile.am     2012-09-15 20:24:24.477918216 +0200

 @@ -3,7 +3,7 @@
  # For non-gcc compilers, change the options to "no-dependencies"
  AUTOMAKE_OPTIONS = foreign dist-zip
  
 -SUBDIRS    = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel windows
 +SUBDIRS    = utils include lib chart tests shutterbug adie pathfinder calculator controlpanel windows
 @@ -3,7 +3,7 @@
  # For non-gcc compilers, change the options to "no-dependencies"
  AUTOMAKE_OPTIONS = foreign dist-zip
  
 -SUBDIRS    = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel windows
 +SUBDIRS    = utils include lib chart tests shutterbug adie pathfinder calculator controlpanel windows

- EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec index.html aclocal.m4
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox-config index.html aclocal.m4

  
  

- pkgconfigdir = $(libdir)/pkgconfig
+ bin_SCRIPTS = fox-config

diff --git a/fox.spec b/fox.spec
index cb4d35467ac101969f6482b3ca8caa22c2f021ea..a2f1926ef3b61f0dce288c779cd65774dc690eb6 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -8,12 +8,12 @@ Summary:      The FOX C++ GUI Toolkit
 Summary(pl.UTF-8):     FOX - toolkit graficzny w C++
 Name:          fox
 # NOTE: after switching to 1.8.x keep stable (1.8.x) on HEAD and devel (1.9.x) on DEVEL
 Summary(pl.UTF-8):     FOX - toolkit graficzny w C++
 Name:          fox
 # NOTE: after switching to 1.8.x keep stable (1.8.x) on HEAD and devel (1.9.x) on DEVEL

-Version:       1.7.34
-Release:       3
+Version:       1.7.36
+Release:       1

 License:       LGPL v3+ with relinking exemption
 Group:         X11/Libraries
 Source0:       http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
 License:       LGPL v3+ with relinking exemption
 Group:         X11/Libraries
 Source0:       http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz

-# Source0-md5: 6ccb46e6a8bf91e33fa3e80ecadb9527
+# Source0-md5: 381e1aed480907e1db4b9ea0a5d22e20

 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch


@@ -204,6 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc ADDITIONS TRACING
 %files devel
 %defattr(644,root,root,755)
 %doc ADDITIONS TRACING

+%attr(755,root,root) %{_bindir}/fox-config

 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/libCHART-1.7.so
 %attr(755,root,root) %{_libdir}/libFOX-1.7.so
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/libCHART-1.7.so
 %attr(755,root,root) %{_libdir}/libFOX-1.7.so