Mon Aug 14 2001 Jens Finke <jens@gnome.org> - Updated to match gpp

* Mon Aug 14 2001 Jens Finke <jens@gnome.org>
- Updated to match gpp standard:
 - removed all hardcoded paths, use rpm macros instead
 - changed Copyright to License
 - removed explicit docdir definition
 - added 'Requires' to devel package
 - added paths to 'configure' and 'make' calls
 - moved %changelog section to the end of the file
 - updated files section to match changes in glib-2.0

1 files changed, 70 insertions, 56 deletions

diff --git a/glib.spec.in b/glib.spec.in
index 67e865dec..cd8ece297 100644
--- a/glib.spec.in
+++ b/glib.spec.in
@@ -1,35 +1,88 @@
-# Note that this is NOT a relocatable package
-%define ver      @VERSION@
-%define rel      1
-%define prefix   /usr
-
-Summary: Handy library of utility functions
-Name: glib
-Version: %ver
-Release: %rel
-Copyright: LGPL
-Group: Libraries
-Source: ftp://ftp.gimp.org/pub/gtk/v1.1/glib-%{ver}.tar.gz
-BuildRoot: /var/tmp/glib-%{PACKAGE_VERSION}-root
-URL: http://www.gtk.org
-Docdir: %{prefix}/doc
+Name:		glib
+Summary:	Handy library of utility functions
+Version:	@VERSION@
+Release:	1
+License:	LGPL
+Group:		Development/Libraries
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.1/%{name}-%{version}.tar.gz
+BuildRoot:	/var/tmp/%{name}-%{version}-root
+URL:		http://www.gtk.org
 
 %description
 Handy library of utility functions.  Development libs and headers
 are in glib-devel.
 
 %package devel
-Summary: GIMP Toolkit and GIMP Drawing Kit support library
-Group: X11/Libraries
+Summary:	GIMP Toolkit and GIMP Drawing Kit support library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}
 
 %description devel
 Static libraries and header files for the support library for the GIMP's X
 libraries, which are available as public libraries.  GLIB includes generally
 useful data structures.
 
+%prep
+%setup -q
+
+%build
+CFLAGS="$RPM_OPT_FLAGS"
+./configure --prefix=%{_prefix} \
+    --bindir=%{_bindir} --mandir=%{_mandir} \
+    --localstatedir=%{_localstatedir} --libdir=%{_libdir} \
+    --datadir=%{_datadir} --includedir=%{_includedir} \
+    --sysconfdir=%{_sysconfdir} --disable-gtk-doc
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} \
+    localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
+    datadir=$RPM_BUILD_ROOT%{_datadir} \
+    includedir=$RPM_BUILD_ROOT%{_includedir} \
+    sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-, root, root)
+
+%{_libdir}/lib*.so
+%{_libdir}/*a
+%{_libdir}/glib-2.0
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/glib-2.0
+%{_mandir}/man1/glib-*
+%{_datadir}/aclocal/*
+%{_bindir}/*
+#%{_datadir}/gtk-doc/html/glib-2.0
+#%{_datadir}/gtk-doc/html/gobject
 
 %changelog
 
+* Mon Aug 14 2001 Jens Finke <jens@gnome.org>
+- Updated to match gpp standard:
+ - removed all hardcoded paths, use rpm macros instead
+ - changed Copyright to License
+ - removed explicit docdir definition 
+ - added 'Requires' to devel package
+ - added paths to 'configure' and 'make' calls
+ - moved %changelog section to the end of the file
+ - updated files section to match changes in glib-2.0
+
 * Tue Jun  1 1999 Jose Mercado <jmercado@mit.edu>
 - fixed version numbers in files section.
 
@@ -53,42 +106,3 @@ useful data structures.
 
 * Mon Apr 13 1998 Marc Ewing <marc@redhat.com>
 - Split out glib package
-
-%prep
-%setup
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/lib/libglib-1.3.so.*
-%{prefix}/lib/libgthread-1.3.so.*
-%{prefix}/lib/libgmodule-1.3.so.*
-%{prefix}/lib/libgobject-1.3.so.*
-
-%files devel
-%defattr(-, root, root)
-
-%{prefix}/lib/lib*.so
-%{prefix}/lib/*a
-%{prefix}/lib/glib
-%{prefix}/include/*
-%{prefix}/man/man1/
-%{prefix}/share/aclocal/*
-%{prefix}/bin/*