[libgnomeprint22] - Merge-review cleanup (#226016)

[paragn]

commit 68edbac359952cee88241d0a34ed381be0196e96
Author: paragn <paragn at fedoraproject.org>
Date:   Thu Sep 23 15:13:37 2010 +0530

    - Merge-review cleanup (#226016)

 libgnomeprint22.spec |   98 ++++++++++++++++++++-----------------------------
 1 files changed, 40 insertions(+), 58 deletions(-)
---
diff --git a/libgnomeprint22.spec b/libgnomeprint22.spec
index 282e0d7..1e1749e 100644
--- a/libgnomeprint22.spec
+++ b/libgnomeprint22.spec
@@ -1,42 +1,32 @@
 %define gettext_package libgnomeprint-2.2
 
-%define glib2_base_version 2.2.0
-%define glib2_version %{glib2_base_version}
-%define pango_version 1.5.0
-%define libxml2_version 2.5
-%define libart_lgpl_version 2.3.8
-%define libbonobo_version 2.1.0
-%define bonobo_activation_version 1.0.0
-%define freetype_version 2.0.3
-%define gtk_doc_version 0.9
-
 Summary: Printing library for GNOME
-Name:		libgnomeprint22
-Version: 	2.18.7
-Release:	1%{?dist}
-License:	LGPLv2+ and BSD
+Name:  libgnomeprint22
+Version:  2.18.7
+Release: 2%{?dist}
+License: LGPLv2+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
-Source: 	http://download.gnome.org/sources/libgnomeprint/2.18/libgnomeprint-%{version}.tar.bz2
+Source:  http://download.gnome.org/sources/libgnomeprint/2.18/libgnomeprint-%{version}.tar.bz2
 URL:            http://www.gnome.org
 
-Requires:	urw-fonts
-Requires:	ghostscript
-Requires:	ghostscript-fonts
-
-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:	libgnomecups-devel >= 0.2.0-1
-BuildRequires:	fontconfig
-BuildRequires:	cups-devel
-BuildRequires:	intltool
-BuildRequires:	zlib-devel
+Requires: urw-fonts
+Requires: ghostscript
+Requires: ghostscript-fonts
+
+BuildRequires: glib2-devel
+BuildRequires: pango-devel
+BuildRequires: libxml2-devel 
+BuildRequires: libart_lgpl-devel
+BuildRequires: libbonobo-devel 
+BuildRequires: bonobo-activation-devel
+BuildRequires: freetype 
+BuildRequires: gtk-doc
+BuildRequires: libgnomecups-devel
+BuildRequires: fontconfig
+BuildRequires: cups-devel
+BuildRequires: intltool
+BuildRequires: zlib-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  openssl-devel
 BuildRequires:  gettext
@@ -57,26 +47,11 @@ gnome-print devel package.
 %package devel
 Summary: Libraries and include files for developing GNOME printing applications
 Group: Development/Libraries
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
-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: %{name} = %{version}-%{release}
 # for /usr/share/gtk-doc/html
 Requires:       gtk-doc
 
 %description devel
-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-devel package
-includes the libraries and include files needed for developing
-applications that use the GNOME printing capabilities.
-
 You should install the gnome-print-devel package if you would like to
 develop GNOME applications that will use the GNOME print capabilities.
 You do not need to install the gnome-print-devel package if you just
@@ -85,40 +60,47 @@ want to use the GNOME desktop environment.
 %prep
 %setup -q -n libgnomeprint-%{version}
 
+# Convert to utf-8
+for file in NEWS; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
 %build
-%configure --disable-rpath --disable-static --disable-gtk-doc
+%configure --disable-static --disable-gtk-doc
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name *.la -exec rm {} \;
 
 %find_lang %{gettext_package}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f %{gettext_package}.lang
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/lib*.so.*
 %{_libdir}/libgnomeprint/
 %{_datadir}/libgnomeprint/
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Thu Sep 09 2010 Parag Nemade <paragn AT fedoraproject.org> 2.18.7-2
+- Merge-review cleanup (#226016)
+
 * Wed Mar 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.18.7-1
 - Update to 2.18.7
 
@@ -208,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT
   - 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.
+  - 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.