- updated required glib2 version, simplified static_libs bcond

Changed files:
    glibmm.spec -> 1.34

diff --git a/glibmm.spec b/glibmm.spec
index e89f4ddb92aac0d289e8113e5ba54245425d1516..140df90754883c8f25e72e5be87791fff8a77168 100644 (file)
--- a/glibmm.spec
+++ b/glibmm.spec
@@ -14,12 +14,14 @@ Source0:    http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/%{name}-%{version}.ta
 URL:           http://gtkmm.sourceforge.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: glib2-devel >= 1:2.6.3
+BuildRequires: glib2-devel >= 1:2.8.0
 BuildRequires: libsigc++-devel >= 1:2.0.10
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.4d
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
+Requires:      glib2 >= 1:2.8.0
+Requires:      libsigc++ >= 1:2.0.10
 Obsoletes:     gtkmm-glib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +36,7 @@ Summary:      Header files for glibmm library
 Summary(pl):   Pliki nag³ówkowe biblioteki glibmm
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.6.3
+Requires:      glib2-devel >= 1:2.8.0
 Requires:      libsigc++-devel >= 1:2.0.10
 Requires:      libstdc++-devel
 Obsoletes:     gtkmm-glib-devel
@@ -45,17 +47,6 @@ Header files for glibmm library.
 %description devel -l pl
 Pliki nag³ówkowe biblioteki glibmm.
 
-%package doc
-Summary:       Reference documentation and examples for glibmm
-Summary(pl):   Szczegó³owa dokumentacja i przyk³ady dla glibmm
-Group:         Documentation
-
-%description doc
-Reference documentation and examples for glibmm.
-
-%description doc -l pl
-Szczegó³owa dokumentacja i przyk³ady dla glibmm.
-
 %package static
 Summary:       Static glibmm library
 Summary(pl):   Statyczna biblioteka glibmm
@@ -69,6 +60,17 @@ Static glibmm library.
 %description static -l pl
 Statyczna biblioteka glibmm.
 
+%package doc
+Summary:       Reference documentation and examples for glibmm
+Summary(pl):   Szczegó³owa dokumentacja i przyk³ady dla glibmm
+Group:         Documentation
+
+%description doc
+Reference documentation and examples for glibmm.
+
+%description doc -l pl
+Szczegó³owa dokumentacja i przyk³ady dla glibmm.
+
 %prep
 %setup -q
 
@@ -79,8 +81,8 @@ Statyczna biblioteka glibmm.
 %{__automake}
 %configure \
        --enable-fulldocs \
-       --enable-static \
-       %{!?with_static_libs:--disable-static}
+       %{?with_static_libs:--enable-static}
+
 %{__make}
 
 %install
@@ -117,13 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/*.pc
 %{_aclocaldir}/*.m4
 
-%files doc
-%defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}-2.4
-%{_examplesdir}/%{name}-%{version}
-
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 %endif
+
+%files doc
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{name}-2.4
+%{_examplesdir}/%{name}-%{version}