rpms/gchempaint/devel gchempaint.spec,1.13,1.14

[Julian Sikorski (belegdol)]

Author: belegdol

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

Modified Files:
	gchempaint.spec 
Log Message:
Spec cleanups


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gchempaint.spec	30 Oct 2007 20:03:07 -0000	1.13
+++ gchempaint.spec	6 Dec 2007 21:43:34 -0000	1.14
@@ -10,16 +10,14 @@
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  gnome-chemistry-utils-devel
-BuildRequires:  scrollkeeper
 BuildRequires:  gnome-doc-utils
-BuildRequires:  perl(XML::Parser)
+BuildRequires:  kdelibs3
 BuildRequires:  libbonoboui-devel
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-BuildRequires:  kdelibs
-BuildRequires:  automake
-BuildRequires:  libtool
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  scrollkeeper
 
 Requires:       hicolor-icon-theme
 
@@ -45,7 +43,9 @@
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
@@ -57,65 +57,43 @@
 %find_lang %{name}
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.3/plugins/gchempaint/gchempaint.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
-
-#kill static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas >/dev/null || :
-    # If the schema file has ever been renamed::
-    #gconftool-2 --makefile-uninstall-rule \
-    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
-fi
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gchempaint.schemas >/dev/null || :
+      %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows}.schemas >/dev/null || :
     # If the schema file has ever been renamed::
     #gconftool-2 --makefile-uninstall-rule \
     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gchempaint.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+  %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows}.schemas > /dev/null || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
-fi
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gchempaint.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+      %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows}.schemas > /dev/null || :
 fi
 
 
@@ -123,28 +101,30 @@
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
 scrollkeeper-update -q || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README TODO
+%{_sysconfdir}/gconf/schemas/gchempaint.schemas
+%{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
 %{_bindir}/gchempaint
 %{_libdir}/gchempaint
 %{_libdir}/libgchempaint-%{version}.so
+%{_libdir}/libgchempaint.so
 %{_libdir}/libgcpcanvas-%{version}.so
 %{_libdir}/libgcpcanvas.so
-%{_libdir}/libgchempaint.so
 %{_libdir}/goffice/0.4.3/plugins/gchempaint
-%{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
-%{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
 %{_datadir}/gchempaint
+%{_datadir}/gnome/help/gchempaint
 %{_datadir}/icons/hicolor/*/apps/gchempaint.png
 %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-application-x-gchempaint.png
-%{_datadir}/gnome/help/gchempaint
 %{_datadir}/mime/packages/gchempaint.xml
 %{_datadir}/mimelnk
 %{_datadir}/omf/gchempaint