rpms/glabels/devel .cvsignore, 1.3, 1.4 glabels.spec, 1.11, 1.12 sources, 1.3, 1.4

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191/devel

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
Update to new upstream development snapshot (2.1.5)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2006 21:48:37 -0000	1.3
+++ .cvsignore	17 Dec 2007 19:45:41 -0000	1.4
@@ -1 +1 @@
-glabels-2.0.4.tar.gz
+glabels-2.1.5.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glabels.spec	22 Aug 2007 01:19:11 -0000	1.11
+++ glabels.spec	17 Dec 2007 19:45:41 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	2.0.4
-Release:	7%{?dist}
+Version:	2.1.5
+Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -12,10 +12,12 @@
 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:	%{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 @@
 
 
 %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,7 +117,6 @@
 scrollkeeper-update -q ||:
 
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -137,10 +136,12 @@
 %files	devel
 %defattr(-,root,root,-)
 %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,-)
@@ -151,13 +152,15 @@
 %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
+* Sun Dec 16 2007 Peter Gordon <peter at thecodergeek.com> - 2.1.5-1
+- Update to new upstream development snapshot (2.1.5).
+
 * Tue Aug 21 2007 Peter Gordon <peter at thecodergeek.com> - 2.0.4-7
 - Rebuild with new BuildID-enabled binutils. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2006 21:48:37 -0000	1.3
+++ sources	17 Dec 2007 19:45:41 -0000	1.4
@@ -1 +1 @@
-76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz
+6f1168ebcf9eed28caa9e9cdcef740b6  glabels-2.1.5.tar.gz