- fixed deps, moved some dirs (glib is the inner package)

- added link patch (link each sublibrary with other used by it)
- added acfix patch to rebuild whole ac/am

Changed files:
    gtkmm-acfix.patch -> 1.1
    gtkmm-link.patch -> 1.1
    gtkmm.spec -> 1.51

diff --git a/gtkmm-acfix.patch b/gtkmm-acfix.patch
new file mode 100644 (file)
index 0000000..8aceac2
--- /dev/null
+++ b/gtkmm-acfix.patch
@@ -0,0 +1,64 @@
+--- gtkmm-2.2.1/configure.in.orig      Sat Mar 15 11:02:06 2003
++++ gtkmm-2.2.1/configure.in   Sat Apr 12 19:35:21 2003
+@@ -22,9 +22,9 @@
+ GTKMM_MICRO_VERSION=1
+ GTKMM_VERSION=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION.$GTKMM_MICRO_VERSION
+ GTKMM_RELEASE=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION
+-AC_DEFINE_UNQUOTED(GTKMM_MAJOR_VERSION, $GTKMM_MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(GTKMM_MINOR_VERSION, $GTKMM_MINOR_VERSION)
+-AC_DEFINE_UNQUOTED(GTKMM_MICRO_VERSION, $GTKMM_MICRO_VERSION)
++AC_DEFINE_UNQUOTED(GTKMM_MAJOR_VERSION, $GTKMM_MAJOR_VERSION, [major version])
++AC_DEFINE_UNQUOTED(GTKMM_MINOR_VERSION, $GTKMM_MINOR_VERSION, [minor version])
++AC_DEFINE_UNQUOTED(GTKMM_MICRO_VERSION, $GTKMM_MICRO_VERSION, [micro version])
+ AC_SUBST(GTKMM_VERSION)
+ AC_SUBST(GTKMM_RELEASE)
+ 
+--- gtkmm-2.2.1/scripts/macros.m4.orig Fri Dec 27 09:42:13 2002
++++ gtkmm-2.2.1/scripts/macros.m4      Sat Apr 12 19:35:56 2003
+@@ -116,7 +116,7 @@
+ 
+   if test "x$gtkmm_debug_refcounting" = "xyes"; then
+   {
+-    AC_DEFINE([GTKMM_DEBUG_REFCOUNTING],[1])
++    AC_DEFINE([GTKMM_DEBUG_REFCOUNTING],[1],[debug refcounting])
+   }
+   fi
+ ])
+--- gtkmm-2.2.1/scripts/cxx_std.m4.orig        Thu Apr 25 15:26:13 2002
++++ gtkmm-2.2.1/scripts/cxx_std.m4     Sat Apr 12 19:37:48 2003
+@@ -35,7 +35,7 @@
+ 
+   if test "x${gtkmm_cv_cxx_has_namespace_std}" = "xyes"; then
+   {
+-    AC_DEFINE([GTKMM_HAVE_NAMESPACE_STD],[1])
++    AC_DEFINE([GTKMM_HAVE_NAMESPACE_STD],[1],[have namespace std])
+   }
+   fi
+ ])
+@@ -70,7 +70,7 @@
+ 
+   if test "x${gtkmm_cv_cxx_has_std_iterator_traits}" = "xyes"; then
+   {
+-    AC_DEFINE([GTKMM_HAVE_STD_ITERATOR_TRAITS],[1])
++    AC_DEFINE([GTKMM_HAVE_STD_ITERATOR_TRAITS],[1],[have std::iterator_traits])
+   }
+   fi
+ ])
+@@ -105,7 +105,7 @@
+ 
+   if test "x${gtkmm_cv_cxx_has_sun_reverse_iterator}" = "xyes"; then
+   {
+-    AC_DEFINE([GTKMM_HAVE_SUN_REVERSE_ITERATOR],[1])
++    AC_DEFINE([GTKMM_HAVE_SUN_REVERSE_ITERATOR],[1],[have Sun reverse_iterator])
+   }
+   fi
+ ])
+@@ -146,7 +146,7 @@
+ 
+   if test "x${gtkmm_cv_cxx_has_template_sequence_ctors}" = "xyes"; then
+   {
+-    AC_DEFINE([GTKMM_HAVE_TEMPLATE_SEQUENCE_CTORS],[1])
++    AC_DEFINE([GTKMM_HAVE_TEMPLATE_SEQUENCE_CTORS],[1],[have templated sequence ctors])
+   }
+   fi
+ ])

diff --git a/gtkmm-link.patch b/gtkmm-link.patch
new file mode 100644 (file)
index 0000000..aa292ef
--- /dev/null
+++ b/gtkmm-link.patch
@@ -0,0 +1,48 @@
+--- gtkmm-2.2.1/pango/pangomm/Makefile.am.orig Mon Oct 21 23:11:02 2002
++++ gtkmm-2.2.1/pango/pangomm/Makefile.am      Sat Apr 12 19:18:16 2003
+@@ -25,5 +25,5 @@
+ libpangomm_1_0_la_SOURCES     = $(files_all_general_cc) $(files_all_posix_cc)
+ endif
+ libpangomm_1_0_la_LDFLAGS     = $(common_ldflags)
+-libpangomm_1_0_la_LIBADD      = $(win32_dlls_extra_libs) $(PANGOMM_LIBS)
++libpangomm_1_0_la_LIBADD      = $(win32_dlls_extra_libs) $(PANGOMM_LIBS) ../../glib/glibmm/libglibmm-2.0.la
+ 
+--- gtkmm-2.2.1/atk/atkmm/Makefile.am.orig     Mon Oct 21 23:10:52 2002
++++ gtkmm-2.2.1/atk/atkmm/Makefile.am  Sat Apr 12 19:19:31 2003
+@@ -27,5 +27,5 @@
+ endif
+ 
+ libatkmm_1_0_la_LDFLAGS = $(common_ldflags)
+-libatkmm_1_0_la_LIBADD = $(win32_dlls_extra_libs) $(ATKMM_LIBS)
++libatkmm_1_0_la_LIBADD = $(win32_dlls_extra_libs) $(ATKMM_LIBS) ../../glib/glibmm/libglibmm-2.0.la
+ 
+--- gtkmm-2.2.1/gdk/gdkmm/Makefile.am.orig     Mon Oct 21 23:10:55 2002
++++ gtkmm-2.2.1/gdk/gdkmm/Makefile.am  Sat Apr 12 19:20:38 2003
+@@ -26,5 +26,5 @@
+ libgdkmm_2_0_la_SOURCES       = $(files_all_general_cc) $(files_all_posix_cc)
+ endif 
+ libgdkmm_2_0_la_LDFLAGS       = $(common_ldflags)
+-libgdkmm_2_0_la_LIBADD        = $(win32_dlls_extra_libs) $(GDKMM_LIBS)
++libgdkmm_2_0_la_LIBADD        = $(win32_dlls_extra_libs) $(GDKMM_LIBS) ../../pango/pangomm/libpangomm-1.0.la
+ 
+--- gtkmm-2.2.1/gtk/gtkmm/Makefile.am.orig     Mon Dec 23 17:54:57 2002
++++ gtkmm-2.2.1/gtk/gtkmm/Makefile.am  Sat Apr 12 19:21:47 2003
+@@ -28,5 +28,5 @@
+ libgtkmm_2_0_la_SOURCES       = $(files_all_general_cc) $(files_all_posix_cc)
+ endif
+ libgtkmm_2_0_la_LDFLAGS       = $(common_ldflags)
+-libgtkmm_2_0_la_LIBADD        = $(win32_dlls_extra_libs) $(GTKMM_LIBS)
++libgtkmm_2_0_la_LIBADD        = $(win32_dlls_extra_libs) $(GTKMM_LIBS) ../../gdk/gdkmm/libgdkmm-2.0.la ../../atk/atkmm/libatkmm-1.0.la
+ 
+--- gtkmm-2.2.1/tools/extra_defs_gen/Makefile.am.orig  Thu Mar  6 08:35:06 2003
++++ gtkmm-2.2.1/tools/extra_defs_gen/Makefile.am       Sat Apr 12 19:25:06 2003
+@@ -22,8 +22,7 @@
+ # This is not used to build the rest of gtkmm.
+ 
+ INCLUDES = $(GTKMM_CFLAGS)
+-LIBS = $(GTKMM_LIBS)
+ 
+ noinst_PROGRAMS = generate_extra_defs
+ generate_extra_defs_SOURCES = generate_defs_gtk.cc
+-generate_extra_defs_LDADD = libgtkmm_generate_extra_defs-2.0.la
++generate_extra_defs_LDADD = $(GTKMM_LIBS) libgtkmm_generate_extra_defs-2.0.la

diff --git a/gtkmm.spec b/gtkmm.spec
index e11f3502a1c243b78b237255ec8403150f608b9a..bc792bc1f9fb8878aa71f7a69f9643ec3de54c8e 100644 (file)
--- a/gtkmm.spec
+++ b/gtkmm.spec
@@ -8,20 +8,27 @@ License:      LGPL
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.2/gtkmm-%{version}.tar.bz2
 Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-link.patch
+Patch2:                %{name}-acfix.patch
 URL:           http://gtkmm.sourceforge.net/
-Requires:      cpp
 BuildRequires: atk-devel >= 1.2.0
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: esound-devel
 BuildRequires: glib2-devel >= 2.2.1
 BuildRequires: gtk+2-devel >= 2.2.1
 BuildRequires: libsigc++-devel >= 1.2.1
 BuildRequires: libstdc++-devel
+BuildRequires: libtool
 BuildRequires: pango-devel >= 1.2.1
 BuildRequires: perl >= 5.6
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: zlib-devel
+Requires:      %{name}-glib = %{version}
+Requires:      %{name}-pango = %{version}
+Requires:      %{name}-atk = %{version}
+Requires:      cpp
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     Gtk--
 
@@ -71,7 +78,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} = %{version}
+Requires:      %{name}-glib = %{version}
 
 %description atk
 A C++ interface for atk library.
@@ -109,7 +116,6 @@ Interfejs C++ dla biblioteki atk - wersja statyczna.
 Summary:       A C++ interface for glib library
 Summary(pl):   Interfejs C++ dla biblioteki glib
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
 
 %description glib
 A C++ interface for glib library.
@@ -147,7 +153,7 @@ Interfejs C++ dla biblioteki glib - wersja statyczna.
 Summary:       A C++ interface for pango library
 Summary(pl):   Interfejs C++ dla biblioteki pango
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name}-glib = %{version}
 
 %description pango
 A C++ interface for pango library.
@@ -159,7 +165,7 @@ 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}-pango-devel = %{version}
+Requires:      %{name}-pango = %{version}
 Requires:      %{name}-glib-devel = %{version}
 Requires:      pango-devel >= 1.2.1
 
@@ -184,8 +190,14 @@ Interfejs C++ dla biblioteki pango - wersja statyczna.
 %prep
 %setup -q -n gtkmm-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I scripts
+%{__autoconf}
+%{__autoheader}
 %{__automake}
 # exceptions and rtti are used in this package --misiek
 %configure \
@@ -199,48 +211,47 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
 
+mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.0/docs installed-docs
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+mv -f $RPM_BUILD_ROOT%{_docdir}/gtkmm-2.0/examples/* \
+       $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%post -n %{name}-atk -p /sbin/ldconfig
-%postun -n %{name}-atk -p /sbin/ldconfig
+%post  -n %{name}-atk -p /sbin/ldconfig
+%postun        -n %{name}-atk -p /sbin/ldconfig
 
-%post -n %{name}-glib -p /sbin/ldconfig
-%postun -n %{name}-glib -p /sbin/ldconfig
+%post  -n %{name}-glib -p /sbin/ldconfig
+%postun        -n %{name}-glib -p /sbin/ldconfig
 
-%post -n %{name}-pango -p /sbin/ldconfig
-%postun -n %{name}-pango -p /sbin/ldconfig
+%post  -n %{name}-pango -p /sbin/ldconfig
+%postun        -n %{name}-pango -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
+%doc README ChangeLog AUTHORS NEWS
 %attr(755,root,root) %{_libdir}/libg[dt]kmm*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc README ChangeLog AUTHORS NEWS
-%{_examplesdir}/%{name}-%{version}
+%doc installed-docs/*
 %attr(755,root,root) %{_libdir}/libg[dt]kmm*.so
 %{_libdir}/libg[dt]kmm*.la
 
-%dir %{_libdir}/gtkmm-2.0
-%dir %{_libdir}/gtkmm-2.0/proc
-%dir %{_libdir}/gtkmm-2.0/include
-%dir %{_libdir}/pkgconfig
-
 %{_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
-%{_pkgconfigdir}/g[dt]kmm*.pc
-
-%dir %{_includedir}/gtkmm-2.0
 
 %{_includedir}/gtkmm-2.0/g[dt]kmm*
-%{_defaultdocdir}/gtkmm-2.0/*
+%{_pkgconfigdir}/g[dt]kmm*.pc
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
@@ -269,9 +280,14 @@ rm -rf $RPM_BUILD_ROOT
 %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*
-%{_pkgconfigdir}/glibmm*.pc
+
+%dir %{_includedir}/gtkmm-2.0
 %{_includedir}/gtkmm-2.0/glibmm*
+%{_pkgconfigdir}/glibmm*.pc
 
 %files glib-static
 %defattr(644,root,root,755)