Fix up a bit to look for the loaders in the right place. (#93011, Dennis

Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk+.spec.in: Fix up a bit to look for the loaders
        in the right place. (#93011, Dennis Dementiev)

diff --git a/ChangeLog b/ChangeLog
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1e4a2a115df492f8b47a49733006e9cba46864f..266edc5390027b2fa1f21ec2db6757631bd7a00d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk+.spec.in: Fix up a bit to look for the loaders
+       in the right place. (#93011, Dennis Dementiev)
+
 Tue Sep 24 05:12:14 2002  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkimcontextsimple.c: Fixes to GtkIMContextSimple

diff --git a/gtk+.spec.in b/gtk+.spec.in
index 9fa66454104f36ebc4a94dbb9e6ec9d78db2b3ca..7e7267c2c138112e75cb69d6b9117007ab369732 100644 (file)
--- a/gtk+.spec.in
+++ b/gtk+.spec.in
@@ -1,10 +1,12 @@
+%define binary_version @GTK_BINARY_VERSION@
+
 Name:           gtk2
 Summary:        The Gimp Toolkit
 Version:        @VERSION@
 Release:        1
 License:        LGPL
 Group:          X11/Libraries
-Source:                 ftp://ftp.gimp.org/pub/gtk/v1.3/gtk+-%{version}.tar.gz
+Source:                 ftp://ftp.gimp.org/pub/gtk/v2.3/gtk+-%{version}.tar.gz
 BuildRoot:      /var/tmp/%{name}-%{version}-root
 URL:            http://www.gtk.org
 Requires:       glib2 >= %{version}
@@ -84,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libgtk*.so.*
 %{_libdir}/libgdk*.so.*
-%{_libdir}/gtk-2.0/%{version}/*/*.so
+%{_libdir}/gtk-2.0/%{binary_version}/*/*.so
 #%{_datadir}/locale/*/*/*
 %{_sysconfdir}/gtk-2.0/gtk.immodules
 
@@ -93,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_libdir}/lib*.so
 %{_libdir}/*a
-%{_libdir}/gtk-2.0/%{version}/*/*a
+%{_libdir}/gtk-2.0/%{binary_version}/*/*a
 %{_libdir}/gtk-2.0/include
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/gtk-2.0         
@@ -103,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 11 2002 Dennis Dementiev <denm@asplinux.ru>
+- modules and loaders should be installed in under binary version
+  dir instead version
+
 * Mon Aug 27 2001 Jens Finke <jens@gnome.org>
 - Renamed package to gtk2.
 - Updated source url.