From 89ec824be87fd21c3945abc1de5b3faaf2a8c4b7 Mon Sep 17 00:00:00 2001
From: Peter Gordon <pgordon@fedoraproject.org>
Date: Jan 15 2008 06:51:25 +0000
Subject: Update to 2.2.0 Final


---

diff --git a/.cvsignore b/.cvsignore
index cfd1537..4964516 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glabels-2.0.4.tar.gz
+glabels-2.2.0.tar.gz
diff --git a/glabels.spec b/glabels.spec
index 1fbfb69..2554498 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	2.0.4
-Release:	7%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -12,10 +12,12 @@ Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	evolution-data-server-devel >= 1.8
 BuildRequires:	gettext
-BuildRequires:	libglade2-devel >= 2.0.1
-BuildRequires:	libgnomeprintui22-devel
-BuildRequires:	libgnomeui-devel >= 2.0 
+BuildRequires:	gtk2 >= 2.10
+BuildRequires:	libglade2-devel >= 2.6
+BuildRequires:	libgnomeui-devel >= 2.16 
+BuildRequires:	libxml2 >= 2.6
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 
@@ -30,7 +32,6 @@ Requires(postun):	shared-mime-info
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	%{name}-doc = %{version}-%{release}
 	
-
 %description
 gLabels is a lightweight program for creating labels and
 business cards for the GNOME desktop environment.
@@ -75,25 +76,24 @@ This package contains the runtime documentation and manual pages for %{name}.
 
 
 %build
-%configure
+%configure --disable-update-mimedb --disable-update-desktopdb
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-## UPDATE_DESKTOP_DATABASE and UPDATE_MIME_DATABASE are set to /bin/true
-## to prevent them from being run as part of the build scripts (which fail
-## when installing to rooted filesystem). These are handled through the %%post
-## and %%postun scriptlets, instead.
-make install DESTDIR=%{buildroot}		\
-	UPDATE_DESKTOP_DATABASE=/bin/true	\
-	UPDATE_MIME_DATABASE=/bin/true
+make install DESTDIR=%{buildroot}
 desktop-file-install					\
 	--vendor=fedora					\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--delete-original				\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
+## Fix encodings.
+for DOC_FILE in AUTHORS ChangeLog NEWS; do
+	%{_bindir}/iconv -f iso8859-1 -t utf-8 ${DOC_FILE} > ${DOC_FILE}.conv;
+	mv -f ${DOC_FILE}.conv ${DOC_FILE};
+done
 
 
 %post
@@ -117,14 +117,13 @@ scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 scrollkeeper-update -q ||:
 
 
-
 %clean
 rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING COPYING.README_FIRST NEWS README TODO
 %{_bindir}/glabels*
 %{_datadir}/application-registry/glabels.applications
 %{_datadir}/applications/fedora-glabels.desktop
@@ -136,28 +135,32 @@ rm -rf %{buildroot}
 
 %files	devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LIBGLABELS
+%doc AUTHORS COPYING-LIBGLABELS
+%doc %{_datadir}/gtk-doc/html/libglabels
 %exclude %{_libdir}/libglabels.la
 %exclude %{_libdir}/libglabels.a
 %{_includedir}/libglabels/
 %{_libdir}/libglabels.so
+%{_libdir}/pkgconfig/libglabels.pc
 
 %files	libs
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LIBGLABELS
+%doc AUTHORS COPYING-LIBGLABELS
 %{_libdir}/libglabels.so.*
 
 %files	doc
 %defattr(-,root,root,-)
 ## Manual ("man") pages are automatically marked as %%doc by RPM. 
 %doc AUTHORS COPYING-DOCS
-%{_datadir}/gnome/help/glabels/
+%doc %{_datadir}/gnome/help/glabels/
 %{_datadir}/omf/glabels/
 %{_mandir}/man?/glabels.*
 
 
-
 %changelog
+* Mon Jan 14 2008 Peter Gordon <peter@thecodergeek.com> - 2.2.0-1
+- Update to new upstream release (2.2.0 Final); Yay!
+
 * Tue Aug 21 2007 Peter Gordon <peter@thecodergeek.com> - 2.0.4-7
 - Rebuild with new BuildID-enabled binutils. 
 
diff --git a/sources b/sources
index 2d42ec0..663b535 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz
+aad7dceaeeb8f376570421a76fa1f225  glabels-2.2.0.tar.gz