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

[baggins]

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

---- Files affected:
SPECS:
   glibmm.spec (1.32 -> 1.32.4.1) 

---- Diffs:

================================================================
Index: SPECS/glibmm.spec
diff -u SPECS/glibmm.spec:1.32 SPECS/glibmm.spec:1.32.4.1
--- SPECS/glibmm.spec:1.32	Fri Dec 16 11:33:45 2005
+++ SPECS/glibmm.spec	Mon May 15 15:11:17 2006
@@ -5,21 +5,23 @@
 Summary:	A C++ interface for glib library
 Summary(pl):	Interfejs C++ dla biblioteki glib
 Name:		glibmm
-Version:	2.8.3
+Version:	2.10.1
 Release:	1
 License:	LGPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	6a915615fb1158a2d761d5777dcd16dc
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.10/%{name}-%{version}.tar.bz2
+# Source0-md5:	3af9f4f3dbec200545f1eb21a678706d
 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(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 @@
 %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 @@
 %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 @@
 %{__automake}
 %configure \
 	--enable-fulldocs \
-	--enable-static \
-	%{!?with_static_libs:--disable-static}
+	%{?with_static_libs:--enable-static}
+
 %{__make}
 
 %install
@@ -117,23 +119,41 @@
 %{_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}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32.4.1  2006/05/15 13:11:17  baggins
+- merged from HEAD
+
+Revision 1.35  2006/04/14 15:09:44  freetz
+- merged from DEVEL and updated to 2.10.1
+
+Revision 1.32.2.2  2006/03/08 22:54:43  freetz
+- 2.10.0
+
+Revision 1.32.2.1  2006/01/29 11:09:22  freetz
+- 2.9.1
+
+Revision 1.34  2006/03/05 00:32:51  qboosh
+- updated required glib2 version, simplified static_libs bcond
+
+Revision 1.33  2006/02/03 22:26:24  qboosh
+- updated to 2.8.4
+
 Revision 1.32  2005/12/16 10:33:45  freetz
 - 2.8.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibmm.spec?r1=1.32&r2=1.32.4.1&f=u