rpms/libgnomeprint22/devel libgnomeprint22.spec,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30868

Modified Files:
	libgnomeprint22.spec 
Log Message:
* Wed Dec 21 2005 Kristian Høgsberg <krh at redhat.com> 2.12.1-4
- Spec file clean-ups from from Matthias Saou (#172923)



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgnomeprint22.spec	9 Dec 2005 22:41:35 -0000	1.30
+++ libgnomeprint22.spec	21 Dec 2005 16:30:10 -0000	1.31
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release: 3.1
+Release:	4
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -26,34 +26,32 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=318029
 Patch0: libgnomeprint-2.12.1-gmodule-no-export.patch
 
-PreReq:	urw-fonts
-PreReq:	ghostscript
-PreReq:	ghostscript-fonts
-PreReq: perl
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: libgnomecups >= 0.2.0-1
-Requires: pango >= %{pango_version}
-
-BuildPrereq: glib2-devel >= %{glib2_version}
-BuildPrereq: pango-devel >= %{pango_version}
-BuildPrereq: libxml2-devel >= %{libxml2_version}
-BuildPrereq: libart_lgpl-devel >= %{libart_lgpl_version}
-BuildPrereq: libbonobo-devel >= %{libbonobo_version}
-BuildPrereq: bonobo-activation-devel >= %{bonobo_activation_version}
-BuildPrereq: freetype >= %{freetype_version}
-BuildPrereq: gtk-doc >= %{gtk_doc_version}
-BuildPrereq: fontconfig
-BuildPrereq: cups-devel
-BuildPrereq: intltool
-BuildPrereq: zlib-devel
-
-BuildPrereq: automake16 >= 1.6.3
-BuildPrereq: autoconf
-BuildPrereq: libtool
-BuildPrereq: libgnomecups-devel >= 0.1.9-2
+Requires:	urw-fonts
+Requires:	ghostscript
+Requires:	ghostscript-fonts
+Requires:	perl
+Requires:	libgnomecups >= 0.2.0-1
+Requires:	pango >= %{pango_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:	freetype >= %{freetype_version}
+BuildRequires:	gtk-doc >= %{gtk_doc_version}
+BuildRequires:	fontconfig
+BuildRequires:	cups-devel
+BuildRequires:	intltool
+BuildRequires:	zlib-devel
+
+BuildRequires:	automake16 >= 1.6.3
+BuildRequires:	autoconf
+BuildRequires:	libtool
+BuildRequires:	libgnomecups-devel >= 0.1.9-2
 
-%description 
+%description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
 manager for the X Window System. The gnome-print package contains
@@ -65,19 +63,18 @@
 gnome-print devel package.
 
 %package devel
-Summary: Libraries and include files for developing GNOME applications.
+Summary: Libraries and include files for developing GNOME printing applications
 Group: Development/Libraries
 
-Requires: %{name} = %{PACKAGE_VERSION}
-Requires: libgnomeprint22 = %{PACKAGE_VERSION}
+Requires:	%{name} = %{version}
 
-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: freetype >= %{freetype_version}
+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:	freetype >= %{freetype_version}
 
 %description devel
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -96,22 +93,16 @@
 %patch0 -p1 -b .gmodule-no-export
 
 %build
-
 aclocal
 libtoolize --force
 autoconf
 automake --add-missing
-%configure --enable-gtk-doc
-make
+%configure --disable-rpath --enable-gtk-doc
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
-
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %find_lang %{gettext_package}
 
 %clean
@@ -122,23 +113,35 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{gettext_package}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/lib*.so.%{sover}
-%{_libdir}/lib*.so.%{sover}.*
-%{_libdir}/libgnomeprint
-%{_datadir}/libgnomeprint
+%{_libdir}/lib*.so.%{sover}*
+%{_libdir}/libgnomeprint/
+%exclude %{_libdir}/libgnomeprint/*/modules/*.a
+%exclude %{_libdir}/libgnomeprint/*/modules/*/*.a
+%{_datadir}/libgnomeprint/
 
 %files devel
-%defattr(-, root, root)
-
+%defattr(-, root, root, 0755)
 %{_libdir}/lib*.so
-%{_libdir}/*.a
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
-%{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Dec 21 2005 Kristian Høgsberg <krh at redhat.com> 2.12.1-4
+- Spec file clean-ups from from Matthias Saou (#172923):
+  - Explicitly disable rpath.
+  - Exclude static modules from the main package.
+  - Exclude static libraries from the devel package (useless).
+  - Don't own entire %{_datadir}/gtk-doc.
+  - Remove explicit pre/post /sbin/ldconfig deps (they're automatic with -p).
+  - Change PreReqs to more correct Requires.
+  - Fix devel summary.
+  - Add _smp_mflags to build.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt