SPECS (AC-branch): gtkmm.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 13:12:33 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gtkmm.spec (1.97 -> 1.97.2.1) 

---- Diffs:

================================================================
Index: SPECS/gtkmm.spec
diff -u SPECS/gtkmm.spec:1.97 SPECS/gtkmm.spec:1.97.2.1
--- SPECS/gtkmm.spec:1.97	Fri Dec 16 12:23:26 2005
+++ SPECS/gtkmm.spec	Mon May 15 15:12:26 2006
@@ -1,25 +1,25 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	examples	# don't build examples
 %bcond_without	static_libs	# don't build static libraries
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	A C++ interface for the GTK+ (a GUI library for X)
 Summary(pl):	Wrapper C++ dla GTK+
 Name:		gtkmm
-Version:	2.8.2
+Version:	2.8.5
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	b7efc6a6a257a044d6e4bca97595a653
+# Source0-md5:	630040e17bb491228ae22919188abcf2
 URL:		http://gtkmm.sourceforge.net/
 BuildRequires:	atk-devel >= 1.9.1
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	glibmm-devel >= 2.8.0
-BuildRequires:	gtk+2-devel >= 2:2.6.4
-BuildRequires:	libsigc++-devel >= 1:2.0.10
+BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	libstdc++-devel >= 5:3.3.1
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	pango-devel >= 1:1.8.1
@@ -29,7 +29,7 @@
 Requires:	%{name}-atk = %{version}-%{release}
 Requires:	%{name}-pango = %{version}-%{release}
 Requires:	cpp
-Requires:	glibmm >= 2.8.0
+Requires:	gtk+2 >= 2:2.8.0
 Obsoletes:	Gtk--
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,9 +53,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-atk-devel = %{version}-%{release}
 Requires:	%{name}-pango-devel = %{version}-%{release}
-Requires:	glibmm-devel >= 2.6.0
-Requires:	gtk+2-devel >= 2:2.6.4
-Requires:	libsigc++-devel >= 1:2.0.10
+Requires:	gtk+2-devel >= 2:2.8.0
 
 %description devel
 Header files and development documentation for GTK-- library.
@@ -91,7 +89,8 @@
 Summary:	A C++ interface for atk library
 Summary(pl):	Interfejs C++ dla biblioteki atk
 Group:		X11/Development/Libraries
-Requires:	glibmm >= 2.6.0
+Requires:	atk >= 1.9.1
+Requires:	glibmm >= 2.8.0
 
 %description atk
 A C++ interface for atk library.
@@ -105,7 +104,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name}-atk = %{version}-%{release}
 Requires:	atk-devel >= 1.9.1
-Requires:	glibmm-devel >= 2.6.0
+Requires:	glibmm-devel >= 2.8.0
 
 %description atk-devel
 A C++ interface for atk library - header files.
@@ -129,7 +128,8 @@
 Summary:	A C++ interface for pango library
 Summary(pl):	Interfejs C++ dla biblioteki pango
 Group:		X11/Development/Libraries
-Requires:	glibmm >= 2.6.0
+Requires:	glibmm >= 2.8.0
+Requires:	pango >= 1:1.8.1
 
 %description pango
 A C++ interface for pango library.
@@ -142,7 +142,7 @@
 Summary(pl):	Interfejs C++ dla biblioteki pango - pliki nagłówkowe
 Group:		X11/Development/Libraries
 Requires:	%{name}-pango = %{version}-%{release}
-Requires:	glibmm-devel >= 2.6.0
+Requires:	glibmm-devel >= 2.8.0
 Requires:	pango-devel >= 1:1.8.1
 
 %description pango-devel
@@ -173,9 +173,10 @@
 %{__automake}
 # exceptions and rtti are used in this package --misiek
 %configure \
-	--enable-static=yes \
-	--enable-demos=no \
-	%{!?with_static_libs:--disable-static}
+	--disable-demos \
+	%{!?with_examples:--disable-examples} \
+	%{?with_static_libs:--enable-static}
+
 %{__make}
 
 %install
@@ -217,7 +218,7 @@
 %files doc
 %defattr(644,root,root,755)
 %doc %{_docdir}/gtkmm-2.4
-%{_examplesdir}/%{name}-%{version}
+%{?with_examples:%{_examplesdir}/%{name}-%{version}}
 %doc %{_datadir}/devhelp/books/gtkmm-2.4
 
 %if %{with static_libs}
@@ -266,6 +267,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97.2.1  2006/05/15 13:12:26  baggins
+- merged from HEAD
+
+Revision 1.101  2006/04/14 15:13:00  freetz
+- 2.8.5
+
+Revision 1.100  2006/03/05 07:30:48  qboosh
+- updated deps, removed redundant ones, simplified static_libs bcond, release 2
+
+Revision 1.99  2006/02/23 21:50:21  adgor
+- Examples bcond
+
+Revision 1.98  2006/02/02 07:23:02  freetz
+- 2.8.3
+
 Revision 1.97  2005/12/16 11:23:26  freetz
 - 2.8.2, autoheader is not needed here
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gtkmm.spec?r1=1.97&r2=1.97.2.1&f=u