Unset CATOBJEXT so that the macros and Makefiles correctly handle

[~andy/gtk] / gtk+.spec

diff --git a/gtk+.spec b/gtk+.spec
index 17cf8ae364c3ebbcdf4a5e7b37256bb8e73963d6..60b4ce6a973170ac036ecc0d13493674e7446574 100644 (file)
--- a/gtk+.spec
+++ b/gtk+.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      1.0.0
+%define ver      1.1.12
 %define rel      SNAP
 %define prefix   /usr
 
@@ -9,12 +9,13 @@ Version: %ver
 Release: %rel
 Copyright: LGPL
 Group: X11/Libraries
-Source: ftp://ftp.gimp.org/pub/gtk/v1.0/gtk+-%{ver}.tar.gz
+Source: ftp://ftp.gimp.org/pub/gtk/v1.1/gtk+-%{ver}.tar.gz
 BuildRoot: /tmp/gtk-root
 Obsoletes: gtk
 Packager: Marc Ewing <marc@redhat.com>
 URL: http://www.gtk.org
 Prereq: /sbin/install-info
+Requires: glib
 Docdir: %{prefix}/doc
 
 %description
@@ -37,6 +38,26 @@ and GTK is a widget set for creating user interfaces.
 
 %changelog
 
+* Sun Oct 25 1998 Shawn T. Amundson <amundson@gtk.org>
+
+- Fixed Source: to point to v1.1 
+
+* Tue Aug 04 1998 Michael Fulbright <msf@redhat.com>
+
+- change %postun to %preun
+
+* Mon Jun 27 1998 Shawn T. Amundson
+
+- Changed version to 1.1.0
+
+* Thu Jun 11 1998 Dick Porter <dick@cymru.net>
+
+- Removed glib, since it is its own module now
+
+* Mon Apr 13 1998 Marc Ewing <marc@redhat.com>
+
+- Split out glib package
+
 * Tue Apr  8 1998 Shawn T. Amundson <amundson@gtk.org>
 
 - Changed version to 1.0.0
@@ -115,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/install-info %{prefix}/info/gdk.info.gz %{prefix}/info/dir
 /sbin/install-info %{prefix}/info/gtk.info.gz %{prefix}/info/dir
 
-%postun devel
+%preun devel
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{prefix}/info/gdk.info.gz %{prefix}/info/dir
     /sbin/install-info --delete %{prefix}/info/gtk.info.gz %{prefix}/info/dir
@@ -125,14 +146,14 @@ fi
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{prefix}/lib/lib*.so.*
+%{prefix}/lib/libgtk-1.1.so.*
+%{prefix}/lib/libgdk-1.1.so.*
 
 %files devel
 %defattr(-, root, root)
 
 %{prefix}/lib/lib*.so
 %{prefix}/lib/*a
-%{prefix}/lib/glib
 %{prefix}/include/*
 %{prefix}/info/*
 %{prefix}/share/aclocal/*