Changes by Hans Breuer:

[~andy/gtk] / gtk+.spec.in

diff --git a/gtk+.spec.in b/gtk+.spec.in
index dc228691fe07a8d345aa36d623c9c6aa1a056471..4706e51a86aa1f1defe28a512f4acdb96155aa8a 100644 (file)
--- a/gtk+.spec.in
+++ b/gtk+.spec.in
@@ -1,6 +1,7 @@
 # Note that this is NOT a relocatable package
 %define ver      @VERSION@
-%define rel      SNAP
+%define  RELEASE 1
+%define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 %define prefix   /usr
 
 Summary: The Gimp Toolkit
@@ -14,7 +15,6 @@ BuildRoot: /var/tmp/gtk-%{PACKAGE_VERSION}-root
 Obsoletes: gtk
 Packager: Christopher Blizzard <blizzard@redhat.com>
 URL: http://www.gtk.org
-Prereq: /sbin/install-info
 Requires: glib
 Docdir: %{prefix}/doc
 
@@ -27,7 +27,6 @@ Summary: GIMP Toolkit and GIMP Drawing Kit
 Group: X11/Libraries
 Requires: gtk+
 Obsoletes: gtk-devel
-PreReq: /sbin/install-info
 
 %description devel
 Static libraries and header files for the GIMP's X libraries, which are
@@ -37,6 +36,10 @@ Xlib to help automate things like dealing with different color depths,
 and GTK is a widget set for creating user interfaces.
 
 %changelog
+
+* Tue Jun  1 1999 Jose Mercado <jmercado@mit.edu>
+- Corrected some typos in files section.
+
 * Sun Feb 21 1999 Michael Fulbright <drmike@redhat.com>
 - updated spec file
 
@@ -125,8 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 
-gzip -9n $RPM_BUILD_ROOT%{prefix}/info/*
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -134,24 +135,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{prefix}/info/gdk.info.gz %{prefix}/info/dir
-/sbin/install-info %{prefix}/info/gtk.info.gz %{prefix}/info/dir
-
-%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
-fi
-
 %files
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{prefix}/lib/libgtk-1.1.so.*
-%{prefix}/lib/libgdk-1.1.so.*
-{prefix}/share/themes/Default
-+%{prefix}/share/locale/*/*/*
+%{prefix}/lib/libgtk-1.3.so.*
+%{prefix}/lib/libgdk-1.3.so.*
+%{prefix}/share/themes/Default
+%{prefix}/share/locale/*/*/*
  
 
 %files devel
@@ -160,7 +151,7 @@ fi
 %{prefix}/lib/lib*.so
 %{prefix}/lib/*a
 %{prefix}/include/*
-%{prefix}/info/*
+%{prefix}/include/lib/gtk+-2.0/include/*
 %{prefix}/man/man1/*
 %{prefix}/share/aclocal/*
 %{prefix}/bin/*