- updated to 1.7.26

- updated opt,Makefile patches
- fix-config is gone, .pc file named fox17 now

Changed files:
    fox-Makefile.patch -> 1.4
    fox-opt.patch -> 1.5
    fox.spec -> 1.117

diff --git a/fox-Makefile.patch b/fox-Makefile.patch
index 838d678da4f978e2215038f6cb3e7bde559a4cd7..a73882e0fe1bb9f4918d42cf6ff1cbeb5d953b49 100644 (file)
--- a/fox-Makefile.patch
+++ b/fox-Makefile.patch
@@ -1,11 +1,11 @@
---- fox-1.7.25/Makefile.am.orig        2010-10-07 04:46:48.000000000 +0200
-+++ fox-1.7.25/Makefile.am     2011-05-13 16:25:36.062671005 +0200
+--- 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
 @@ -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 fox.lsm index.html aclocal.m4
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec index.html aclocal.m4
  
- bin_SCRIPTS = fox-config
+ pkgconfigdir = $(libdir)/pkgconfig

diff --git a/fox-opt.patch b/fox-opt.patch
index dad8b0ae138ea953d50d008d485d5c269a2202aa..f91be2ebe8155de39558e14c6e4bf58aa10e7aa0 100644 (file)
--- a/fox-opt.patch
+++ b/fox-opt.patch
@@ -1,5 +1,5 @@
---- fox-1.7.25/configure.ac.orig       2010-11-24 06:11:50.000000000 +0100
-+++ fox-1.7.25/configure.ac    2011-05-13 16:20:27.532660673 +0200
+--- fox-1.7.26/configure.ac.orig       2011-04-13 02:14:35.000000000 +0200
++++ fox-1.7.26/configure.ac    2011-05-28 07:38:29.803780335 +0200
 @@ -56,9 +56,6 @@
  AC_SUBST(LT_REVISION)
  AC_SUBST(LT_AGE)
@@ -26,7 +26,7 @@
 -  CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
 +  CXXFLAGS="${CXXFLAGS} -DNDEBUG"
    if test "${GXX}" = "yes" ; then
-     CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+     CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer"
 -    LDFLAGS="-s ${LDFLAGS}"
    fi
  fi

diff --git a/fox.spec b/fox.spec
index abf4cf525f2f1077ec84db330bef7706e730b952..51531bf78744bc9a4d629cc7fccc56620e8610f5 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -6,12 +6,12 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl.UTF-8):     FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.7.25
+Version:       1.7.26
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 232e2996be39148287e80b59061c7a66
+# Source0-md5: acaf8a1f33d02265b26a2b0c3fd06625
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
@@ -199,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -207,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libCHART-1.7.la
 %{_libdir}/libFOX-1.7.la
 %{_includedir}/fox-1.7
-%{_pkgconfigdir}/fox.pc
+%{_pkgconfigdir}/fox17.pc
 %{_mandir}/man1/reswrap.1*
 
 %if %{with static_libs}