rpms/verbiste/devel verbiste.spec,1.9,1.10

[Konstantin Ryabitsev (icon)]

Author: icon

Update of /cvs/extras/rpms/verbiste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5295/devel

Modified Files:
	verbiste.spec 
Log Message:
Fixes to build with a slimmer buildsys.



Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- verbiste.spec	13 Feb 2006 19:30:32 -0000	1.9
+++ verbiste.spec	29 Jun 2006 23:20:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           verbiste
 Version:        0.1.14
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        French conjugation system
 
 Group:          Applications/Text
@@ -9,8 +9,8 @@
 Source:         http://www3.sympatico.ca/sarrazip/dev/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  libxml2-devel, gnome-panel-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  libxml2-devel, gnome-panel-devel, desktop-file-utils, gettext
+
 
 %description
 This package contains a database of French conjugation templates
@@ -33,6 +33,8 @@
 Summary:        GNOME Panel applet for Verbiste
 Group:          Applications/Text
 Requires:       %{name} = %{version}-%{release}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description gnome
 GNOME Panel applet and application based on Verbiste.
@@ -49,8 +51,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+%makeinstall
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # This file gets created on x86_64 for no apparent reason.
 # It's owned by glibc-common.
@@ -70,10 +71,16 @@
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
+%post gnome
+update-desktop-database &> /dev/null ||:
+
+%postun gnome
+update-desktop-database &> /dev/null ||:
+
+
 %files
 %defattr(-,root,root,-)
 %doc doc/*
@@ -101,6 +108,10 @@
 
 
 %changelog
+* Wed Jun 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.14-2
+- BuildRequire gettext
+- Run update-desktop-database in post/postun for -gnome
+
 * Mon Feb 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.14-1.1
 - FC5 Rebuild