- md5, many unifications, cosmetics

- deal with gl and gnome options (bconds, default on)
- added opt patch to pass our optflags

Changed files:
    gai.spec -> 1.2

diff --git a/gai.spec b/gai.spec
index a98e8d31bee4957d227d1a56fe9679bc8d0d3f36..46c1bb404ed7583de585b4985183576a844383b8 100644 (file)
--- a/gai.spec
+++ b/gai.spec
@@ -1,18 +1,28 @@
-Summary:       General Applet Interface Library
-Summary(pl):   Ogólna Biblioteka Interfejsu Apletu
+#
+# Conditional build:
+%bcond_without gl      # without OpenGL support
+%bcond_without gnome   # without GNOME support
+#
+Summary:       General Applet Interface library
+Summary(pl):   Ogólna biblioteka interfejsu apletu
 Name:          gai
 Version:       0.5.0
 %define _pre    pre6
 Release:       0.%{_pre}.1
-License:       GPL v2
-Group:         X11/Development/Libraries
-Source0:       http://cesnet.dl.sourceforge.net/sourceforge/gai/%{name}-%{version}%{_pre}.tar.bz2
+License:       LGPL
+Group:         X11/Libraries
+Source0:       http://dl.sourceforge.net/gai/%{name}-%{version}%{_pre}.tar.bz2
+# Source0-md5: 379c23c0448e24d3dbb330b2e29e37ca
+Patch0:                %{name}-opt.patch
 URL:           http://gai.sourceforge.net
-BuildRequires: gtk+2-devel
-Requires:      gtk+2
-Requires(post,postun): /sbin/ldconfig
+%{?with_gl:BuildRequires:      gtkglext-devel >= 1.0}
+%{?with_gnome:BuildRequires:   gnome-panel-devel >= 2.4.0}
+BuildRequires: gtk+2-devel >= 2.0
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreqdep   libGL.so.1 libGLU.so.1
+
 %description
 This library is intended to simplify the development and use of
 dockapps. With this library the programmer can focus on what the
@@ -28,37 +38,52 @@ Summary:    Development files for the GAI
 Summary(pl):   Pliki rozwojowe dla GAI
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+%{?with_gl:Requires:   gtkglext-devel >= 1.0}
+%{?with_gnome:Requires:        gnome-panel-devel >= 2.4.0}
+Requires:      gtk+2-devel >= 2.0
 
 %description devel
-Header files required for GAI
+Header files required for development using GAI.
 
 %description devel -l pl
-Pliki nag³ówkowe wymagane przez GAI
+Pliki nag³ówkowe wymagane do tworzenia programów z u¿yciem GAI.
 
 %prep
 %setup -q -n %{name}-%{version}%{_pre}
+%patch0 -p1
 
 %build
-%configure
-%{__make}
+%configure \
+       %{!?with_gl:--without-gl} \
+       %{!?with_gnome:--without-gnome}
+
+%{__make} \
+       OPT="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -rf examples/[!C]* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README THANKS TODO examples
-%{_libdir}/libgai*
+%doc AUTHORS ChangeLog README THANKS TODO WINDOWMANAGERS docs/FAQ.html
+%attr(755,root,root) %{_libdir}/libgai.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/gai/gai.h
-%{_libdir}/pkgconfig/gai.pc
+%doc docs/referenceguide.html
+%attr(755,root,root) %{_libdir}/libgai.so
+%{_includedir}/gai
+%{_pkgconfigdir}/gai.pc
+%{_examplesdir}/%{name}-%{version}