Updated to match gpp requirements, reworked the files section to make it

2001-08-27  Jens Finke <jens@gnome.org>

	* gtk+.spec.in: Updated to match gpp requirements, reworked the
	files section to make it work with 1.3.x releases.

1 files changed, 75 insertions, 107 deletions

diff --git a/gtk+.spec.in b/gtk+.spec.in
index 4706e51a86..5c5e9c2237 100644
--- a/gtk+.spec.in
+++ b/gtk+.spec.in
@@ -1,32 +1,29 @@
-# Note that this is NOT a relocatable package
-%define ver      @VERSION@
-%define  RELEASE 1
-%define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-%define prefix   /usr
-
-Summary: The Gimp Toolkit
-Name: gtk+
-Version: %ver
-Release: %rel
-Copyright: LGPL
-Group: X11/Libraries
-Source: ftp://ftp.gimp.org/pub/gtk/v1.1/gtk+-%{ver}.tar.gz
-BuildRoot: /var/tmp/gtk-%{PACKAGE_VERSION}-root
-Obsoletes: gtk
-Packager: Christopher Blizzard <blizzard@redhat.com>
-URL: http://www.gtk.org
-Requires: glib
-Docdir: %{prefix}/doc
+Name:		 gtk+
+Summary:	 The Gimp Toolkit
+Version:	 @VERSION@
+Release:	 1
+License:	 LGPL
+Group:		 X11/Libraries
+Source:		 ftp://ftp.gimp.org/pub/gtk/v1.1/gtk+-%{version}.tar.gz
+BuildRoot:	 /var/tmp/gtk-%{version}-root
+Obsoletes:	 gtk
+URL:		 http://www.gtk.org
+Requires:	 glib >= %{version}
+Requires:        pango
+Requires:        atk
+BuildRequires:   glib-devel
+BuildRequires:   pango-devel
+BuildRequires:   atk-devel
 
 %description
 The X libraries originally written for the GIMP, which are now used by
 several other programs as well.
 
 %package devel
-Summary: GIMP Toolkit and GIMP Drawing Kit
-Group: X11/Libraries
-Requires: gtk+
-Obsoletes: gtk-devel
+Summary:	GIMP Toolkit and GIMP Drawing Kit
+Group:		X11/Libraries
+Requires:	%{name} = %{version}
+Obsoletes:	gtk-devel
 
 %description devel
 Static libraries and header files for the GIMP's X libraries, which are
@@ -35,85 +32,28 @@ structures, GDK is a drawing toolkit which provides a thin layer over
 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
-
-* 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
-
-* Tue Apr  7 1998 Owen Taylor <otaylor@gtk.org>
-
-- Changed version to 0.99.10
-
-* Thu Mar 19 1998 Shawn T. Amundson <amundson@gimp.org>
-
-- Changed version to 0.99.9
-- Changed gtk home page to www.gtk.org
-
-* Thu Mar 19 1998 Shawn T. Amundson <amundson@gimp.org>
-
-- Changed version to 0.99.8
-
-* Sun Mar 15 1998 Marc Ewing <marc@redhat.com>
-
-- Added aclocal and bin stuff to file list.
-
-- Added -k to the SMP make line.
-
-- Added lib/glib to file list.
-
-* Fri Mar 14 1998 Shawn T. Amundson <amundson@gimp.org>
-
-- Changed version to 0.99.7
-
-* Fri Mar 14 1998 Shawn T. Amundson <amundson@gimp.org>
-
-- Updated ftp url and changed version to 0.99.6
-
-* Thu Mar 12 1998 Marc Ewing <marc@redhat.com>
-
-- Reworked to integrate into gtk+ source tree
-
-- Truncated ChangeLog.  Previous Authors:
-  Trond Eivind Glomsrod <teg@pvv.ntnu.no>
-  Michael K. Johnson <johnsonm@redhat.com>
-  Otto Hammersmith <otto@redhat.com>
   
 %prep
 %setup
 
 %build
+%ifarch alpha
+    MYARCH_FLAGS="--host=alpha-redhat-linux"
+%endif
+
 # Needed for snapshot releases.
+MYCFLAGS="$RPM_OPT_FLAGS"
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
+    CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS \
+        --prefix=%{_prefix} \
+	--localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \
+	--mandir=%{_mandir} --libdir=%{_libdir} \
+	--includedir=%{_includedir}
 else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+   CFLAGS="$MYCFLAGS" ./configure $MYARCH_FLAGS \
+        --prefix=%{_prefix} --localstatedir=%{_localstatedir} \
+        --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} \
+        --libdir=%{_libdir} --includedir=%{_includedir} --disable-gtk-doc
 fi
 
 if [ "$SMP" != "" ]; then
@@ -126,7 +66,11 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make -k sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
+    prefix=$RPM_BUILD_ROOT%{_prefix} mandir=$RPM_BUILD_ROOT%{_mandir} \
+    localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
+    libdir=$RPM_BUILD_ROOT%{_libdir} \
+    includedir=$RPM_BUILD_ROOT%{_includedir} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,19 +83,43 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{prefix}/lib/libgtk-1.3.so.*
-%{prefix}/lib/libgdk-1.3.so.*
-%{prefix}/share/themes/Default
-%{prefix}/share/locale/*/*/*
- 
+%{_bindir}/*
+%{_libdir}/libgtk*.so.*
+%{_libdir}/libgdk*.so.*
+%{_libdir}/gtk-2.0/%{version}/*/*.so
+#%{_datadir}/locale/*/*/*
+%{_sysconfdir}/gtk-2.0/gtk.immodules
 
 %files devel
 %defattr(-, root, root)
 
-%{prefix}/lib/lib*.so
-%{prefix}/lib/*a
-%{prefix}/include/*
-%{prefix}/include/lib/gtk+-2.0/include/*
-%{prefix}/man/man1/*
-%{prefix}/share/aclocal/*
-%{prefix}/bin/*
+%{_libdir}/lib*.so
+%{_libdir}/*a
+%{_libdir}/gtk-2.0/%{version}/*/*a
+%{_libdir}/gtk-2.0/include
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/gtk-2.0		
+%{_datadir}/gtk-2.0
+%{_datadir}/aclocal/*
+%{_datadir}/gtk-doc/html/*
+
+
+%changelog
+* Mon Aug 27 2001 Jens Finke <jens@gnome.org>
+- Updated spec file to match gpp standard and 
+  1.3.x files.
+- Removed all hardcoded paths, use rpm macros instead.
+- Added pango and atk Requires: and BuildRequires: statements.
+- Removed Docdir: statement.
+- Moved ChangeLog to the end of the file.
+- Truncated ChangeLog (Mar 12 1998 - Jun 1 1999)
+  Previous Authors:
+  Jose Mercado <jmercado@mit.edu>
+  Michael Fulbright <drmike@redhat.com>
+  Shawn T. Amundson <amundson@gtk.org>
+  Dick Porter <dick@cymru.net>
+  Marc Ewing <marc@redhat.com>
+  Owen Taylor <otaylor@gtk.org>
+  Trond Eivind Glomsrod <teg@pvv.ntnu.no>
+  Michael K. Johnson <johnsonm@redhat.com>
+  Otto Hammersmith <otto@redhat.com>