Updated to match gpp standard.

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

	* pango.spec.in: Updated to match gpp standard.

8 files changed, 79 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index b9dd64e9..2e382f32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b9dd64e9..2e382f32 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+2001-08-15  Jens Finke <jens@gnome.org>
+
+	* pango.spec.in: Updated to match gpp standard.
+
 2001-08-14  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
diff --git a/pango.spec.in b/pango.spec.in
index a63fa041..68f0d88e 100644
--- a/pango.spec.in
+++ b/pango.spec.in
@@ -1,24 +1,24 @@
-%define prefix /usr
-
-Summary: System for layout and rendering of internationalized text
-Name: pango
-Version: @VERSION@
-Release: 1
-Copyright: LGPL
-Group: System Environment/Libraries
-Source: http://www.pango.org/download/pango-%{version}.tar.gz
-BuildRoot: /var/tmp/pango-%{PACKAGE_VERSION}-root
+Summary:	System for layout and rendering of internationalized text
+Name:		pango
+Version:	@VERSION@
+Release:	1
+License:	LGPL
+Group:		System Environment/Libraries
+Source:		http://www.pango.org/download/%{name}-%{version}.tar.gz
+BuildRoot:	/var/tmp/%{name}-%{version}-root
+Requires:	glib
+BuildRequires:	glib-devel
 
 %description
 System for layout and rendering of internationalized text.
 
 %package devel
-Summary:  System for layout and rendering of internationalized text
-Group: Development/Libraries
-Requires: pango = %{PACKAGE_VERSION}
-Requires: libunicode-devel
-Requires: fribidi-devel
-Requires: XFree86-devel
+Summary:	System for layout and rendering of internationalized text
+Group:		Development/Libraries
+Requires:	name = %{version}
+Requires:	libunicode-devel
+Requires:	fribidi-devel
+Requires:	XFree86-devel
 
 %description devel
 The pango-devel package includes the static libraries and header files
@@ -27,44 +27,62 @@ for the pango package.
 Install pango-devel if you want to develop programs which will use
 pango.
 
-%changelog
-* Fri Feb 11 2000 Owen Taylor <otaylor@redhat.com>
-- Created spec file
-
 %prep
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=/etc --localstatedir=/var
+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
-mkdir -p $RPM_BUILD_ROOT%{prefix}
 
-make install DESTDIR=$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
 /sbin/ldconfig
-/usr/bin/pango-querymodules > /etc/pango/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
 
 %postun -p /sbin/ldconfig
 
 %files
 %doc README AUTHORS COPYING ChangeLog TODO
 %doc examples/HELLO.utf8
-%{prefix}/lib/libpango*-*.so
-%{prefix}/bin/pango-querymodules
-%{prefix}/bin/pango-viewer
-%{prefix}/lib/pango/modules/*
-%config /etc/pango/pangox.aliases
+%{_libdir}/libpango*-*.so
+%{_bindir}/pango-*
+%{_libdir}/pango
+%config %{_sysconfdir}/pango/pangox.aliases
 
 %files devel
 %defattr(-, root, root)
-%{prefix}/lib/libpango*.so
-%{prefix}/bin/pango-config
-%{prefix}/lib/libpango*.a
-%{prefix}/include/*
+%{_libdir}/libpango*.so
+%{_libdir}/*a
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/pango-1.0
+%{_datadir}/gtk-doc/html/pango
+
+%changelog
+* Wed Aug 16 2001 Jens Finke <jens@gnome.org>
+- Updated spec file to match GPP standard:
+ - Removed %define for prefix
+ - Use License instead of Copyright
+ - Added Requires: for glib.
+ - Use rpm macros in the %files section
+ - added pkgconfig dir to devel package
+ - other minor clean ups
+
+* Fri Feb 11 2000 Owen Taylor <otaylor@redhat.com>
+- Created spec file