- merged from DEVEL and updated to 2.4.0

Changed files:
    gtkmm.spec -> 1.68

diff --git a/gtkmm.spec b/gtkmm.spec
index 0de73c409df28bdecf5e772b9f228b24ee1ea0aa..3ab14236c06fddf3914993e1aa676af005c34011 100644 (file)
--- a/gtkmm.spec
+++ b/gtkmm.spec
@@ -1,34 +1,31 @@
-%include        /usr/lib/rpm/macros.perl
+%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.2.10
+Version:       2.4.0
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.2/gtkmm-%{version}.tar.bz2
-# Source0-md5: 30d62d2ea8f3fbaf0a2a2d2f8373bec2
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-ac.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 00df8eb3d562f52e26494d90cbada1e4
 URL:           http://gtkmm.sourceforge.net/
-BuildRequires: atk-devel >= 1.2.0
+BuildRequires: atk-devel >= 1.6.0
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: esound-devel
-BuildRequires: glib2-devel >= 2.2.1
-BuildRequires: gtk+2-devel >= 1:2.2.1
-BuildRequires: libsigc++12-devel >= 1.2.1
+BuildRequires: glibmm-devel >= 2.4.0
+BuildRequires: graphviz
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: libsigc++-devel >= 1.9.16
 BuildRequires: libstdc++-devel >= 5:3.3.1
 BuildRequires: libtool >= 2:1.4d-3
-BuildRequires: pango-devel >= 1.2.1
-BuildRequires: perl >= 5.6
+BuildRequires: pango-devel >= 1.4.0
+BuildRequires: perl-base >= 5.6
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov >= 3.0.3-16
-BuildRequires: zlib-devel
 Requires:      %{name}-atk = %{version}-%{release}
-Requires:      %{name}-glib = %{version}-%{release}
 Requires:      %{name}-pango = %{version}-%{release}
 Requires:      cpp
+Requires:      glibmm >= 2.4.0
 Obsoletes:     Gtk--
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +49,9 @@ Group:                X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-atk-devel = %{version}-%{release}
 Requires:      %{name}-pango-devel = %{version}-%{release}
-Requires:      gtk+2-devel >= 1:2.2.1
+Requires:      glibmm-devel >= 2.4.0
+Requires:      gtk+2-devel >= 2:2.4.0
+Requires:      libsigc++-devel >= 1.9.16
 
 %description devel
 Header files and development documentation for GTK-- library.
@@ -64,6 +63,7 @@ Pliki nag
 Summary:       Reference documentation and examples for GTK-- and GDK--
 Summary(pl):   Szczegó³owa dokumentacja i przyk³ady dla GTK-- i GDK--
 Group:         Documentation
+Requires:      devhelp
 
 %description doc
 Reference documentation and examples for GTK-- and GDK--.
@@ -87,7 +87,7 @@ Biblioteki statyczne GTK-- i GDK--.
 Summary:       A C++ interface for atk library
 Summary(pl):   Interfejs C++ dla biblioteki atk
 Group:         X11/Development/Libraries
-Requires:      %{name}-glib = %{version}-%{release}
+Requires:      glibmm >= 2.4.0
 
 %description atk
 A C++ interface for atk library.
@@ -100,8 +100,8 @@ Summary:    A C++ interface for atk library - header files
 Summary(pl):   Interfejs C++ dla biblioteki atk - pliki nag³ówkowe
 Group:         X11/Development/Libraries
 Requires:      %{name}-atk = %{version}-%{release}
-Requires:      %{name}-glib-devel = %{version}-%{release}
-Requires:      atk-devel >= 1.2.0
+Requires:      atk-devel >= 1.6.0
+Requires:      glibmm-devel >= 2.4.0
 
 %description atk-devel
 A C++ interface for atk library - header files.
@@ -121,49 +121,11 @@ A C++ interface for atk library - static version.
 %description atk-static -l pl
 Interfejs C++ dla biblioteki atk - wersja statyczna.
 
-%package glib
-Summary:       A C++ interface for glib library
-Summary(pl):   Interfejs C++ dla biblioteki glib
-Group:         X11/Development/Libraries
-
-%description glib
-A C++ interface for glib library.
-
-%description glib -l pl
-Interfejs C++ dla biblioteki glib.
-
-%package glib-devel
-Summary:       A C++ interface for glib library - header files
-Summary(pl):   Interfejs C++ dla biblioteki glib - pliki nag³ówkowe
-Group:         X11/Development/Libraries
-Requires:      %{name}-glib = %{version}-%{release}
-Requires:      glib2-devel >= 2.2.1
-Requires:      libsigc++12-devel >= 1.2.1
-Requires:      libstdc++-devel >= 5:3.3.1
-
-%description glib-devel
-A C++ interface for glib library - header files.
-
-%description glib-devel -l pl
-Interfejs C++ dla biblioteki glib - pliki nag³ówkowe.
-
-%package glib-static
-Summary:       A C++ interface for glib library - static version
-Summary(pl):   Interfejs C++ dla biblioteki glib - wersja statyczna
-Group:         X11/Development/Libraries
-Requires:      %{name}-glib-devel = %{version}-%{release}
-
-%description glib-static
-A C++ interface for glib library - static version.
-
-%description glib-static -l pl
-Interfejs C++ dla biblioteki glib - wersja statyczna.
-
 %package pango
 Summary:       A C++ interface for pango library
 Summary(pl):   Interfejs C++ dla biblioteki pango
 Group:         X11/Development/Libraries
-Requires:      %{name}-glib = %{version}-%{release}
+Requires:      glibmm >= 2.4.0
 
 %description pango
 A C++ interface for pango library.
@@ -175,9 +137,9 @@ Interfejs C++ dla biblioteki pango.
 Summary:       A C++ interface for pango library - header files
 Summary(pl):   Interfejs C++ dla biblioteki pango - pliki nag³ówkowe
 Group:         X11/Development/Libraries
-Requires:      %{name}-glib-devel = %{version}-%{release}
 Requires:      %{name}-pango = %{version}-%{release}
-Requires:      pango-devel >= 1.2.1
+Requires:      glibmm-devel >= 2.4.0
+Requires:      pango-devel >= 1.4.0
 
 %description pango-devel
 A C++ interface for pango library - header files.
@@ -199,11 +161,6 @@ Interfejs C++ dla biblioteki pango - wersja statyczna.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-
-# GLIBMM_PROG_CXX_SUN exists only in aclocal.m4
-tail -n +6979 aclocal.m4 | head -n 15 > scripts/cxx-sun.m4
 
 %build
 %{__libtoolize}
@@ -224,8 +181,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
 
-mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.0/docs installed-docs
-mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.0/examples/* \
+mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.4/docs installed-docs
+mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.4/{examples,tests} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -237,36 +194,27 @@ rm -rf $RPM_BUILD_ROOT
 %post  atk -p /sbin/ldconfig
 %postun        atk -p /sbin/ldconfig
 
-%post  glib -p /sbin/ldconfig
-%postun        glib -p /sbin/ldconfig
-
 %post  pango -p /sbin/ldconfig
 %postun        pango -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog AUTHORS NEWS
+%doc AUTHORS ChangeLog CHANGES NEWS PORTING README
 %attr(755,root,root) %{_libdir}/libg[dt]kmm*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libg[dt]kmm*.so
 %{_libdir}/libg[dt]kmm*.la
-
-%{_libdir}/gtkmm-*/include/g[dt]kmm*
-%dir %{_libdir}/gtkmm-2.0/proc
-%{_libdir}/gtkmm-*/proc/m4
-%{_libdir}/gtkmm-*/proc/pm
-%attr(755,root,root) %{_libdir}/gtkmm-*/proc/gtkmmproc
-%attr(755,root,root) %{_libdir}/gtkmm-*/proc/*.pl
-
-%{_includedir}/gtkmm-2.0/g[dt]kmm*
+%{_libdir}/gtkmm-2.4
+%{_includedir}/g[dt]kmm-2.4
 %{_pkgconfigdir}/g[dt]kmm*.pc
 
 %files doc
 %defattr(644,root,root,755)
 %doc installed-docs/*
 %{_examplesdir}/%{name}-%{version}
+%doc %{_datadir}/devhelp/books/gtkmm-2.4
 
 %files static
 %defattr(644,root,root,755)
@@ -281,33 +229,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libatkmm*.so
 %{_libdir}/libatkmm*.la
 %{_pkgconfigdir}/atkmm*.pc
-%{_includedir}/gtkmm-2.0/atkmm*
+%{_includedir}/atkmm-1.6
+%{_includedir}/atkmm-2.6
 
 %files atk-static
 %defattr(644,root,root,755)
 %{_libdir}/libatkmm*.a
 
-%files glib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libglibmm*.so.*.*
-
-%files glib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libglibmm*.so
-%{_libdir}/libglibmm*.la
-
-%dir %{_libdir}/gtkmm-2.0
-%dir %{_libdir}/gtkmm-2.0/include
-%{_libdir}/gtkmm-*/include/glibmm*
-
-%dir %{_includedir}/gtkmm-2.0
-%{_includedir}/gtkmm-2.0/glibmm*
-%{_pkgconfigdir}/glibmm*.pc
-
-%files glib-static
-%defattr(644,root,root,755)
-%{_libdir}/libglibmm*.a
-
 %files pango
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpangomm*.so.*.*
@@ -317,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpangomm*.so
 %{_libdir}/libpangomm*.la
 %{_pkgconfigdir}/pangomm*.pc
-%{_includedir}/gtkmm-2.0/pangomm*
+%{_includedir}/pangomm-1.4
 
 %files pango-static
 %defattr(644,root,root,755)