- use standard includes location, apps had enough time to switch

- release 2

Changed files:
    fox.spec -> 1.68

diff --git a/fox.spec b/fox.spec
index 818add29bf2df55d5a73297f693601491defc7c3..81da6eb926a519125310c851e56568b1318ef83c 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -2,7 +2,7 @@ Summary:        The FOX C++ GUI Toolkit
 Summary(pl):   FOX - toolkit graficzny w C++
 Name:          fox
 Version:       1.2.4
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
@@ -107,11 +107,8 @@ LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 rm -rf $RPM_BUILD_ROOT
 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 \
-       chartincludedir=%{_includedir}/fox/chart
+       DESTDIR=$RPM_BUILD_ROOT
 
 ln -sf libFOX-1.1.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
@@ -142,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)