rpms/stardict/devel stardict.spec,1.61,1.62

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20108

Modified Files:
	stardict.spec 
Log Message:
Since the Rawhide rebuild failed due to libtool 2:

* Tue Dec  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.1-15
- BR libtool and run libtoolize to fix build with libtool2.
- Add preun scriptlet for GConf2 uninstall rule.
- Build with SMP make flags.
- Install with -p.



Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- stardict.spec	29 Aug 2008 10:38:17 -0000	1.61
+++ stardict.spec	2 Dec 2008 14:06:01 -0000	1.62
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	14%{?dist}
+Release:	15%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -18,10 +18,12 @@
 
 Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
 #Requires: festival, speech-tools
+Requires(preun): GConf2
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
-BuildRequires: autoconf, automake, desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+BuildRequires: autoconf, automake, libtool
+BuildRequires: desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
 #BuildRequires: festival-devel, speech-tools-devel
 
 %description
@@ -46,12 +48,13 @@
 %build
 %{__aclocal}
 %{__autoconf}
-%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival
-make
+%{__libtoolize}
+%configure --disable-schemas-install --disable-festival
+make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
@@ -59,9 +62,9 @@
 
 # copy config file of locale specific default dictionaries
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
+rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
 
 
@@ -87,14 +90,25 @@
 %doc README COPYING ChangeLog AUTHORS doc/FAQ doc/HACKING doc/HowToCreateDictionary doc/StarDictFileFormat doc/Translation
 
 
+%preun
+if [ "$1" -gt 1 ] ; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/stardict.schemas >/dev/null || :
+fi
+
 %post
-GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/stardict.schemas >/dev/null
+GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/stardict.schemas >/dev/null || :
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %postun
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Tue Dec  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.1-15
+- BR libtool and run libtoolize to fix build with libtool2.
+- Add preun scriptlet for GConf2 uninstall rule.
+- Build with SMP make flags.
+- Install with -p.
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.1-14.fc10
 - Include /etc/stardict directory