--- a/libgnomeprint.spec	Thu May 29 12:14:25 2003 +0000
+++ b/libgnomeprint.spec	Thu May 29 12:24:36 2003 +0000
@@ -1,19 +1,13 @@
-#
-# Copyright (c) 2003 Sun Microsystems Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
 Name:         libgnomeprint
 License:      LGPL
-Group:        Development/Libraries/GNOME
+Group:        System/Libraries/GNOME
 Version:      2.2.1.2
 Release:      1
 Distribution: Mercury
 Vendor:	      Sun Microsystems Inc.
-Summary:      The GNOME 2.x printing library 
+Summary:      Print Library for the GNOME Desktop
 Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.2/libgnomeprint-%{version}.tar.bz2
-URL:          www.gnome.org
+URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
 
@@ -21,83 +15,64 @@
 
 %define glib2_version 2.2.1
 %define pango_version 1.2.1
-%define libxml2_version 2.4.23
 %define libart_lgpl_version 2.3.11
-%define libbonobo_version 2.1.0
-%define bonobo_activation_version 2.2.1
-%define freetype2_version 2.1.3
 %define gtk_doc_version 1.0
-%define XFree86_version 4.3.0
+%define gnome_common_version 1.2.4
+%define cups_version 1.1.15
 
 Requires:      glib >= %{glib2_version}
 Requires:      pango >= %{pango_version}
-Requires:      libxml2 >= %{libxml2_version}
 Requires:      libart_lgpl >= %{libart_lgpl_version}
-Requires:      libbonobo >= %{libbonobo_version}
-Requires:      bonobo-activation >= %{bonobo_activation_version}
-Requires:      freetype2 >= %{freetype2_version}
-Requires:      cups
+Requires:      cups >= %{cups_version}
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version}
-BuildRequires: freetype2-devel >= %{freetype2_version}
 BuildRequires: gtk-doc >= %{gtk_doc_version}
-BuildRequires: XFree86-devel >= %{XFree86_version}
-BuildRequires: cups-devel
+BuildRequires: cups-devel >= %{cups_version}
+BuildRequires: gnome-common >= %{gnome_common_version}
 
 %description
-This package contains the GNOME 2.x printing library, which provides a simple and clean API for GNOME programs that have to print documents.
+libgnomeprint is the printing library for the GNOME desktop, providing a simple and clean
+API for GNOME applications to print documents.
 
 %package devel
-Summary:      Developer's files for the GNOME 2.x printing library
+Summary:      Print Development Library for the GNOME Desktop
 Group:        Development/Libraries/GNOME
-Autoreqprov:  on
-Requires: %{name}=%{version}-%{release}
-Requires: glib2-devel >= %{glib2_version}
-Requires: pango-devel >= %{pango_version}
-Requires: libxml2-devel >= %{libxml2_version}
-Requires: libart_lgpl-devel >= %{libart_lgpl_version}
-Requires: libbonobo-devel >= %{libbonobo_version}
-Requires: bonobo-activation-devel >= %{bonobo_activation_version}
-Requires: freetype2 >= %{freetype2_version}
+Requires:     %{name} = %{version}
+Requires:     glib2-devel >= %{glib2_version}
+Requires:     pango-devel >= %{pango_version}
+Requires:     libart_lgpl-devel >= %{libart_lgpl_version}
 
 %description devel
-This package contain all files needed for development of programs that use libgnomeprint.
+libgnomeprint is the printing library for the GNOME desktop, providing a simple and clean
+API for GNOME applications to print documents.
 
 %prep
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-  ./configure \
-	--prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
-	--with-native-locale=yes \
-	--with-xinput=xfree \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}
-
-
+CFLAGS="$RPM_OPT_FLAGS"				\
+./configure --prefix=%{_prefix}			\
+	    --sysconfdir=%{_sysconfdir}		\
+	    --mandir=%{_mandir}
 make
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{_datadir}/fonts/pfbs
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{_datadir}/gnome-print/fonts
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc AUTHORS COPYING README NEWS ChangeLog
 %{_datadir}/locale/*/LC_MESSAGES/libgnomeprint-2.2.mo
 %{_datadir}/libgnomeprint
 %{_datadir}/fonts
@@ -110,7 +85,6 @@
 %{_libdir}/*a
 %{_libdir}/libgnomeprint/*/*/*/*a
 
-
 %changelog
 * Tue May 13 2003 - [email protected]
 - Initial Sun release