- updated to 2.14.1

- removed obsolete -lt.patch
- pangomm library moved to pangomm.spec

Changed files:
    gtkmm.spec -> 1.126

diff --git a/gtkmm.spec b/gtkmm.spec
index f7e90522ffe56cb7d80a391cd0fb70462612d456..77d4f1793a184d0712473ab59afbd8e48c17383e 100644 (file)
--- a/gtkmm.spec
+++ b/gtkmm.spec
@@ -1,39 +1,33 @@
-# TODO
-# - think of eliminating cpp runtime dep, as cpp pulls gcc
 #
 # 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.UTF-8):     Wrapper C++ dla GTK+
 Name:          gtkmm
-Version:       2.12.7
+Version:       2.14.1
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: ad199f4a392799134c128deab48fee30
-Patch0:                %{name}-lt.patch
-URL:           http://gtkmm.sourceforge.net/
-BuildRequires: atk-devel >= 1:1.20.0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 0209b424987a74c956ea6b70fddaaa37
+URL:           http://www.gtkmm.org/
+BuildRequires: atk-devel >= 1:1.24.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
-BuildRequires: cairomm-devel >= 1.4.4
-BuildRequires: glibmm-devel >= 2.14.1
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: cairomm-devel >= 1.6.3
+BuildRequires: glibmm-devel >= 2.18.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
 BuildRequires: libstdc++-devel >= 5:3.3.1
 BuildRequires: libtool >= 2:1.4d-3
-BuildRequires: pango-devel >= 1:1.18.1
+BuildRequires: pangomm-devel >= 2.14.0
 BuildRequires: perl-base >= 1:5.6.0
 BuildRequires: pkgconfig
-BuildRequires: rpm-perlprov >= 3.0.3-16
 Requires:      %{name}-atk = %{version}-%{release}
-Requires:      %{name}-pango = %{version}-%{release}
-Requires:      cairomm >= 1.4.4
-Requires:      cpp
-Requires:      gtk+2 >= 2:2.12.0
+Requires:      cairomm >= 1.6.3
+Requires:      glibmm >= 2.18.0
+Requires:      gtk+2 >= 2:2.14.0
+Requires:      pangomm >= 2.14.0
 Obsoletes:     Gtk--
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,55 +40,56 @@ extensible using inheritance and over 110 classes that can be freely
 combined to quickly create complex user interfaces.
 
 %description -l pl.UTF-8
-GTK-- jest wrapperem C++ dla Gimp ToolKit (GTK). GTK+ jest biblioteką
+gtkmm jest wrapperem C++ dla Gimp ToolKit (GTK). GTK+ jest biblioteką
 służącą do tworzenia graficznych interfejsów. W pakiecie znajduje się
-także biblioteka GDK-- - wrapper C++ dla GDK (General Drawing Kit).
+także biblioteka gdkmm - wrapper C++ dla GDK (General Drawing Kit).
 
 %package devel
-Summary:       GTK-- and GDK-- header files, development documentation
-Summary(pl.UTF-8):     Pliki nagłówkowe GTK-- i GDK--, dokumentacja dla programistów
+Summary:       gtkmm and gdkmm header files
+Summary(pl.UTF-8):     Pliki nagłówkowe gtkmm i gdkmm
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-atk-devel = %{version}-%{release}
-Requires:      %{name}-pango-devel = %{version}-%{release}
-Requires:      gtk+2-devel >= 2:2.12.0
+Requires:      glibmm-devel >= 2.18.0
+Requires:      gtk+2-devel >= 2:2.14.0
+Requires:      pangomm-devel >= 2.14.0
 
 %description devel
-Header files and development documentation for GTK-- library.
+Header files for gtkmm library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe i dokumentacja dla programistów do biblioteki GTK--.
+Pliki nagłówkowe biblioteki gtkmm.
 
 %package doc
-Summary:       Reference documentation and examples for GTK-- and GDK--
-Summary(pl.UTF-8):     Szczegółowa dokumentacja i przykłady dla GTK-- i GDK--
+Summary:       Reference documentation for gtkmm and gdkmm
+Summary(pl.UTF-8):     Szczegółowa dokumentacja gtkmm i gdkmm
 Group:         Documentation
 Requires:      devhelp
 
 %description doc
-Reference documentation and examples for GTK-- and GDK--.
+Reference documentation for gtkmm and gdkmm.
 
 %description doc -l pl.UTF-8
-Szczegółowa dokumentacja i przykłady dla GTK-- i GDK--.
+Szczegółowa dokumentacja gtkmm i gdkmm.
 
 %package static
-Summary:       GTK-- and GDK-- static libraries
-Summary(pl.UTF-8):     Biblioteki statyczne GTK-- i GDK--
+Summary:       gtkmm and gdkmm static libraries
+Summary(pl.UTF-8):     Biblioteki statyczne gtkmm i gdkmm
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-GTK-- and GDK-- static libraries.
+gtkmm and gdkmm static libraries.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne GTK-- i GDK--.
+Biblioteki statyczne gtkmm i gdkmm.
 
 %package atk
 Summary:       A C++ interface for atk library
 Summary(pl.UTF-8):     Interfejs C++ dla biblioteki atk
-Group:         X11/Development/Libraries
-Requires:      atk >= 1:1.20.0
-Requires:      glibmm >= 2.14.1
+Group:         X11/Libraries
+Requires:      atk >= 1:1.24.0
+Requires:      glibmm >= 2.18.0
 
 %description atk
 A C++ interface for atk library.
@@ -107,8 +102,8 @@ Summary:    A C++ interface for atk library - header files
 Summary(pl.UTF-8):     Interfejs C++ dla biblioteki atk - pliki nagłówkowe
 Group:         X11/Development/Libraries
 Requires:      %{name}-atk = %{version}-%{release}
-Requires:      atk-devel >= 1:1.20.0
-Requires:      glibmm-devel >= 2.14.1
+Requires:      atk-devel >= 1:1.24.0
+Requires:      glibmm-devel >= 2.18.0
 
 %description atk-devel
 A C++ interface for atk library - header files.
@@ -128,50 +123,8 @@ A C++ interface for atk library - static version.
 %description atk-static -l pl.UTF-8
 Interfejs C++ dla biblioteki atk - wersja statyczna.
 
-%package pango
-Summary:       A C++ interface for pango library
-Summary(pl.UTF-8):     Interfejs C++ dla biblioteki pango
-Group:         X11/Development/Libraries
-Requires:      cairomm >= 1.4.4
-Requires:      glibmm >= 2.14.1
-Requires:      pango >= 1:1.18.1
-
-%description pango
-A C++ interface for pango library.
-
-%description pango -l pl.UTF-8
-Interfejs C++ dla biblioteki pango.
-
-%package pango-devel
-Summary:       A C++ interface for pango library - header files
-Summary(pl.UTF-8):     Interfejs C++ dla biblioteki pango - pliki nagłówkowe
-Group:         X11/Development/Libraries
-Requires:      %{name}-pango = %{version}-%{release}
-Requires:      cairomm-devel >= 1.4.4
-Requires:      glibmm-devel >= 2.14.1
-Requires:      pango-devel >= 1:1.18.1
-
-%description pango-devel
-A C++ interface for pango library - header files.
-
-%description pango-devel -l pl.UTF-8
-Interfejs C++ dla biblioteki pango - pliki nagłówkowe.
-
-%package pango-static
-Summary:       A C++ interface for pango library - static version
-Summary(pl.UTF-8):     Interfejs C++ dla biblioteki pango - wersja statyczna
-Group:         X11/Development/Libraries
-Requires:      %{name}-pango-devel = %{version}-%{release}
-
-%description pango-static
-A C++ interface for pango library - static version.
-
-%description pango-static -l pl.UTF-8
-Interfejs C++ dla biblioteki pango - wersja statyczna.
-
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -180,21 +133,15 @@ Interfejs C++ dla biblioteki pango - wersja statyczna.
 %{__automake}
 %configure \
        --disable-demos \
-       %{!?with_examples:--disable-examples} \
        %{?with_static_libs:--enable-static}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir}
-
-mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.4/{examples,tests} \
-       $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -205,9 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  atk -p /sbin/ldconfig
 %postun        atk -p /sbin/ldconfig
 
-%post  pango -p /sbin/ldconfig
-%postun        pango -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog CHANGES NEWS PORTING README
@@ -233,7 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_docdir}/gtkmm-2.4
 %{_datadir}/devhelp/books/gtkmm-2.4
-%{?with_examples:%{_examplesdir}/%{name}-%{version}}
 
 %if %{with static_libs}
 %files static
@@ -259,21 +202,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libatkmm-1.6.a
 %endif
-
-%files pango
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpangomm-1.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpangomm-1.4.so.1
-
-%files pango-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpangomm-1.4.so
-%{_libdir}/libpangomm-1.4.la
-%{_pkgconfigdir}/pangomm-1.4.pc
-%{_includedir}/pangomm-1.4
-
-%if %{with static_libs}
-%files pango-static
-%defattr(644,root,root,755)
-%{_libdir}/libpangomm-1.4.a
-%endif